leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/nvkm: remove nvkm_subdev.index

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2021-02-08 11:30:21 +10:00
parent be0ed63f9b
commit 5ef25f068c
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
View File

@ -5,8 +5,6 @@
#include <core/event.h>
enum nvkm_subdev_type;
#define nvkm_devidx nvkm_subdev_type
enum nvkm_device_type {
NVKM_DEVICE_PCI,
NVKM_DEVICE_AGP,

9
drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
View File

@ -4,13 +4,9 @@
#include <core/device.h>
enum nvkm_subdev_type {
#define NVKM_LAYOUT_ONCE(t,s,p) t,
#define NVKM_LAYOUT_INST_3(t) t, t##0 = t, t##1, t##2, t##_LAST = t##2,
#define NVKM_LAYOUT_INST_9(t) t, t##0 = t, t##1, t##2, t##3, t##4, t##5, t##6, t##7, t##8, t##_LAST = t##8,
#define NVKM_LAYOUT_INST(t,s,p,c) NVKM_LAYOUT_INST_##c(t)
#define NVKM_LAYOUT_ONCE(t,s,p,...) t,
#define NVKM_LAYOUT_INST NVKM_LAYOUT_ONCE
#include <core/layout.h>
#undef NVKM_LAYOUT_INST_9
#undef NVKM_LAYOUT_INST_3
#undef NVKM_LAYOUT_INST
#undef NVKM_LAYOUT_ONCE
NVKM_SUBDEV_NR
@ -19,7 +15,6 @@ enum nvkm_subdev_type {
struct nvkm_subdev {
const struct nvkm_subdev_func *func;
struct nvkm_device *device;
enum nvkm_devidx index;
enum nvkm_subdev_type type;
int inst;
char name[16];

1
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
View File

@ -174,7 +174,6 @@ nvkm_subdev_ctor(const struct nvkm_subdev_func *func, struct nvkm_device *device
subdev->device = device;
subdev->type = type;
subdev->inst = inst < 0 ? 0 : inst;
subdev->index = type + subdev->inst;
if (inst >= 0)
snprintf(subdev->name, sizeof(subdev->name), "%s%d", nvkm_subdev_type[type], inst);

2
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View File

@ -2645,7 +2645,7 @@ nvkm_device_subdev(struct nvkm_device *device, int type, int inst)
struct nvkm_subdev *subdev;
list_for_each_entry(subdev, &device->subdev, head) {
if (subdev->index == type + inst)
if (subdev->type == type && subdev->inst == inst)
return subdev;
}