Commit 9c28abb7 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/subdev: store full subdev name in struct 



Much easier to store this to avoid having to reconstruct a string for a
specific subdev, taking into account whether it's instanced or not.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 54d10db1

drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ void gp102_sec2_flcn_bind_context(struct nvkm_falcon *, struct nvkm_memory *); 
int gp102_sec2_flcn_enable(struct nvkm_falcon *);



#define FLCN_PRINTK(t,f,fmt,a...) do {                               \

	if (nvkm_subdev_name[(f)->owner->index] != (f)->name)                  \

	if ((f)->owner->name != (f)->name)                           \

		nvkm_##t((f)->owner, "%s: "fmt"\n", (f)->name, ##a); \

	else                                                         \

		nvkm_##t((f)->owner, fmt"\n", ##a);                  \

drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h

+4 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ struct nvkm_subdev { 
	const struct nvkm_subdev_func *func;

	struct nvkm_device *device;

	enum nvkm_devidx index;

	char name[16];

	u32 debug;

	struct list_head head;
@@ -23,7 +24,7 @@ struct nvkm_subdev_func { 
	void (*intr)(struct nvkm_subdev *);

};



extern const char *nvkm_subdev_name[NVKM_SUBDEV_NR];

extern const char *nvkm_subdev_type[NVKM_SUBDEV_NR];

int nvkm_subdev_new_(const struct nvkm_subdev_func *, struct nvkm_device *,

		     int index, struct nvkm_subdev **);

void nvkm_subdev_ctor(const struct nvkm_subdev_func *, struct nvkm_device *,
@@ -38,10 +39,8 @@ void nvkm_subdev_intr(struct nvkm_subdev *); 
/* subdev logging */

#define nvkm_printk_(s,l,p,f,a...) do {                                        \

	const struct nvkm_subdev *_subdev = (s);                               \

	if (CONFIG_NOUVEAU_DEBUG >= (l) && _subdev->debug >= (l)) {            \

		dev_##p(_subdev->device->dev, "%s: "f,                         \

			nvkm_subdev_name[_subdev->index], ##a);                \

	}                                                                      \

	if (CONFIG_NOUVEAU_DEBUG >= (l) && _subdev->debug >= (l))              \

		dev_##p(_subdev->device->dev, "%s: "f, _subdev->name, ##a);    \

} while(0)

#define nvkm_printk(s,l,p,f,a...) nvkm_printk_((s), NV_DBG_##l, p, f, ##a)

#define nvkm_fatal(s,f,a...) nvkm_printk((s), FATAL,   crit, f, ##a)

drivers/gpu/drm/nouveau/nvkm/core/engine.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ nvkm_engine_ctor(const struct nvkm_engine_func *func, 
	refcount_set(&engine->use.refcount, 0);

	mutex_init(&engine->use.mutex);



	if (!nvkm_boolopt(device->cfgopt, nvkm_subdev_name[index], enable)) {

	if (!nvkm_boolopt(device->cfgopt, engine->subdev.name, enable)) {

		nvkm_debug(&engine->subdev, "disabled\n");

		return -ENODEV;

	}

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <subdev/mc.h>



const char *

nvkm_subdev_name[NVKM_SUBDEV_NR] = {

nvkm_subdev_type[NVKM_SUBDEV_NR] = {

	[NVKM_SUBDEV_ACR     ] = "acr",

	[NVKM_SUBDEV_BAR     ] = "bar",

	[NVKM_SUBDEV_VBIOS   ] = "bios",
@@ -212,11 +212,11 @@ nvkm_subdev_ctor(const struct nvkm_subdev_func *func, 
		 struct nvkm_device *device, int index,

		 struct nvkm_subdev *subdev)

{

	const char *name = nvkm_subdev_name[index];

	subdev->func = func;

	subdev->device = device;

	subdev->index = index;

	subdev->debug = nvkm_dbgopt(device->dbgopt, name);

	strscpy(subdev->name, nvkm_subdev_type[index], sizeof(subdev->name));

	subdev->debug = nvkm_dbgopt(device->dbgopt, subdev->name);

	list_add_tail(&subdev->head, &device->subdev);

}

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+1 −1
Original line number Diff line number Diff line
@@ -3269,7 +3269,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
			device->m = NULL;                                      \

			if (ret != -ENODEV) {                                  \

				nvdev_error(device, "%s ctor failed, %d\n",    \

					    nvkm_subdev_name[s], ret);         \

					    nvkm_subdev_type[(s)], ret);       \

				goto done;                                     \

			}                                                      \

		}                                                              \