niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/nouveau/falcon: use split type+inst when looking up PRI addr

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-06 11:06:50 +10:00
parent fcc08a7c0d
commit b7da823a3e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
View file

@ -22,7 +22,7 @@ struct nvkm_top_device {
struct list_head head; struct list_head head;
}; };
u32 nvkm_top_addr(struct nvkm_device *, enum nvkm_devidx); u32 nvkm_top_addr(struct nvkm_device *, enum nvkm_subdev_type, int);
u32 nvkm_top_reset(struct nvkm_device *, enum nvkm_subdev_type, int); u32 nvkm_top_reset(struct nvkm_device *, enum nvkm_subdev_type, int);
u32 nvkm_top_intr_mask(struct nvkm_device *, enum nvkm_subdev_type, int); u32 nvkm_top_intr_mask(struct nvkm_device *, enum nvkm_subdev_type, int);
int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_devidx); int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_devidx);

2
drivers/gpu/drm/nouveau/nvkm/falcon/base.c
View file

@ -141,7 +141,7 @@ nvkm_falcon_oneinit(struct nvkm_falcon *falcon)
u32 reg; u32 reg;
if (!falcon->addr) { if (!falcon->addr) {
falcon->addr = nvkm_top_addr(subdev->device, subdev->index); falcon->addr = nvkm_top_addr(subdev->device, subdev->type, subdev->inst);
if (WARN_ON(!falcon->addr)) if (WARN_ON(!falcon->addr))
return -ENODEV; return -ENODEV;
} }

4
drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
View file

@ -43,14 +43,14 @@ nvkm_top_device_new(struct nvkm_top *top)
} }
u32 u32
nvkm_top_addr(struct nvkm_device *device, enum nvkm_devidx index) nvkm_top_addr(struct nvkm_device *device, enum nvkm_subdev_type type, int inst)
{ {
struct nvkm_top *top = device->top; struct nvkm_top *top = device->top;
struct nvkm_top_device *info; struct nvkm_top_device *info;
if (top) { if (top) {
list_for_each_entry(info, &top->device, head) { list_for_each_entry(info, &top->device, head) {
if (info->index == index) if (info->type == type && info->inst == inst)
return info->addr; return info->addr;
} }
} }