Commit 5ef25f06 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/nvkm: remove nvkm_subdev.index 



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

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

+0 −2
Original line number Diff line number Diff line
@@ -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,

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

+2 −7
Original line number Diff line number Diff line
@@ -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];

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

+0 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}