Skip to content

L
linux
Commit 3517e6b6 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files
Options

drm/nouveau/disp: group supervisor-related struct members 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent acbe9ecf
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 32 deletions
drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
View file @ 3517e6b6
...@@ -18,9 +18,11 @@ struct nvkm_disp { ...@@ -18,9 +18,11 @@ struct nvkm_disp {
struct nvkm_event hpd; struct nvkm_event hpd;
struct nvkm_event vblank; struct nvkm_event vblank;
struct workqueue_struct *wq; struct {
struct work_struct supervisor; struct workqueue_struct *wq;
u32 super; struct work_struct work;
u32 pending;
} super;
struct nvkm_event uevent; struct nvkm_event uevent;
......
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
View file @ 3517e6b6
...@@ -983,19 +983,19 @@ gf119_disp_core_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, ...@@ -983,19 +983,19 @@ gf119_disp_core_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
void void
gf119_disp_super(struct work_struct *work) gf119_disp_super(struct work_struct *work)
{ {
struct nvkm_disp *disp = container_of(work, struct nvkm_disp, supervisor); struct nvkm_disp *disp = container_of(work, struct nvkm_disp, super.work);
struct nvkm_subdev *subdev = &disp->engine.subdev; struct nvkm_subdev *subdev = &disp->engine.subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
struct nvkm_head *head; struct nvkm_head *head;
u32 mask[4]; u32 mask[4];
nvkm_debug(subdev, "supervisor %d\n", ffs(disp->super)); nvkm_debug(subdev, "supervisor %d\n", ffs(disp->super.pending));
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
mask[head->id] = nvkm_rd32(device, 0x6101d4 + (head->id * 0x800)); mask[head->id] = nvkm_rd32(device, 0x6101d4 + (head->id * 0x800));
HEAD_DBG(head, "%08x", mask[head->id]); HEAD_DBG(head, "%08x", mask[head->id]);
} }
if (disp->super & 0x00000001) { if (disp->super.pending & 0x00000001) {
nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG); nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG);
nv50_disp_super_1(disp); nv50_disp_super_1(disp);
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
...@@ -1004,7 +1004,7 @@ gf119_disp_super(struct work_struct *work) ...@@ -1004,7 +1004,7 @@ gf119_disp_super(struct work_struct *work)
nv50_disp_super_1_0(disp, head); nv50_disp_super_1_0(disp, head);
} }
} else } else
if (disp->super & 0x00000002) { if (disp->super.pending & 0x00000002) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(mask[head->id] & 0x00001000)) if (!(mask[head->id] & 0x00001000))
continue; continue;
...@@ -1022,7 +1022,7 @@ gf119_disp_super(struct work_struct *work) ...@@ -1022,7 +1022,7 @@ gf119_disp_super(struct work_struct *work)
nv50_disp_super_2_2(disp, head); nv50_disp_super_2_2(disp, head);
} }
} else } else
if (disp->super & 0x00000004) { if (disp->super.pending & 0x00000004) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(mask[head->id] & 0x00001000)) if (!(mask[head->id] & 0x00001000))
continue; continue;
...@@ -1096,9 +1096,9 @@ gf119_disp_intr(struct nvkm_disp *disp) ...@@ -1096,9 +1096,9 @@ gf119_disp_intr(struct nvkm_disp *disp)
if (intr & 0x00100000) { if (intr & 0x00100000) {
u32 stat = nvkm_rd32(device, 0x6100ac); u32 stat = nvkm_rd32(device, 0x6100ac);
if (stat & 0x00000007) { if (stat & 0x00000007) {
disp->super = (stat & 0x00000007); disp->super.pending = (stat & 0x00000007);
queue_work(disp->wq, &disp->supervisor); queue_work(disp->super.wq, &disp->super.work);
nvkm_wr32(device, 0x6100ac, disp->super); nvkm_wr32(device, 0x6100ac, disp->super.pending);
stat &= ~0x00000007; stat &= ~0x00000007;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
View file @ 3517e6b6
...@@ -897,20 +897,20 @@ gv100_disp_caps_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, ...@@ -897,20 +897,20 @@ gv100_disp_caps_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
void void
gv100_disp_super(struct work_struct *work) gv100_disp_super(struct work_struct *work)
{ {
struct nvkm_disp *disp = container_of(work, struct nvkm_disp, supervisor); struct nvkm_disp *disp = container_of(work, struct nvkm_disp, super.work);
struct nvkm_subdev *subdev = &disp->engine.subdev; struct nvkm_subdev *subdev = &disp->engine.subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
struct nvkm_head *head; struct nvkm_head *head;
u32 stat = nvkm_rd32(device, 0x6107a8); u32 stat = nvkm_rd32(device, 0x6107a8);
u32 mask[4]; u32 mask[4];
nvkm_debug(subdev, "supervisor %d: %08x\n", ffs(disp->super), stat); nvkm_debug(subdev, "supervisor %d: %08x\n", ffs(disp->super.pending), stat);
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
mask[head->id] = nvkm_rd32(device, 0x6107ac + (head->id * 4)); mask[head->id] = nvkm_rd32(device, 0x6107ac + (head->id * 4));
HEAD_DBG(head, "%08x", mask[head->id]); HEAD_DBG(head, "%08x", mask[head->id]);
} }
if (disp->super & 0x00000001) { if (disp->super.pending & 0x00000001) {
nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG); nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG);
nv50_disp_super_1(disp); nv50_disp_super_1(disp);
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
...@@ -919,7 +919,7 @@ gv100_disp_super(struct work_struct *work) ...@@ -919,7 +919,7 @@ gv100_disp_super(struct work_struct *work)
nv50_disp_super_1_0(disp, head); nv50_disp_super_1_0(disp, head);
} }
} else } else
if (disp->super & 0x00000002) { if (disp->super.pending & 0x00000002) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(mask[head->id] & 0x00001000)) if (!(mask[head->id] & 0x00001000))
continue; continue;
...@@ -937,7 +937,7 @@ gv100_disp_super(struct work_struct *work) ...@@ -937,7 +937,7 @@ gv100_disp_super(struct work_struct *work)
nv50_disp_super_2_2(disp, head); nv50_disp_super_2_2(disp, head);
} }
} else } else
if (disp->super & 0x00000004) { if (disp->super.pending & 0x00000004) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(mask[head->id] & 0x00001000)) if (!(mask[head->id] & 0x00001000))
continue; continue;
...@@ -1000,9 +1000,9 @@ gv100_disp_intr_ctrl_disp(struct nvkm_disp *disp) ...@@ -1000,9 +1000,9 @@ gv100_disp_intr_ctrl_disp(struct nvkm_disp *disp)
u32 stat = nvkm_rd32(device, 0x611c30); u32 stat = nvkm_rd32(device, 0x611c30);
if (stat & 0x00000007) { if (stat & 0x00000007) {
disp->super = (stat & 0x00000007); disp->super.pending = (stat & 0x00000007);
queue_work(disp->wq, &disp->supervisor); queue_work(disp->super.wq, &disp->super.work);
nvkm_wr32(device, 0x611860, disp->super); nvkm_wr32(device, 0x611860, disp->super.pending);
stat &= ~0x00000007; stat &= ~0x00000007;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
View file @ 3517e6b6
...@@ -1521,15 +1521,15 @@ nv50_disp_super_1(struct nvkm_disp *disp) ...@@ -1521,15 +1521,15 @@ nv50_disp_super_1(struct nvkm_disp *disp)
void void
nv50_disp_super(struct work_struct *work) nv50_disp_super(struct work_struct *work)
{ {
struct nvkm_disp *disp = container_of(work, struct nvkm_disp, supervisor); struct nvkm_disp *disp = container_of(work, struct nvkm_disp, super.work);
struct nvkm_subdev *subdev = &disp->engine.subdev; struct nvkm_subdev *subdev = &disp->engine.subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
struct nvkm_head *head; struct nvkm_head *head;
u32 super = nvkm_rd32(device, 0x610030); u32 super = nvkm_rd32(device, 0x610030);
nvkm_debug(subdev, "supervisor %08x %08x\n", disp->super, super); nvkm_debug(subdev, "supervisor %08x %08x\n", disp->super.pending, super);
if (disp->super & 0x00000010) { if (disp->super.pending & 0x00000010) {
nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG); nv50_disp_chan_mthd(disp->chan[0], NV_DBG_DEBUG);
nv50_disp_super_1(disp); nv50_disp_super_1(disp);
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
...@@ -1540,7 +1540,7 @@ nv50_disp_super(struct work_struct *work) ...@@ -1540,7 +1540,7 @@ nv50_disp_super(struct work_struct *work)
nv50_disp_super_1_0(disp, head); nv50_disp_super_1_0(disp, head);
} }
} else } else
if (disp->super & 0x00000020) { if (disp->super.pending & 0x00000020) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(super & (0x00000080 << head->id))) if (!(super & (0x00000080 << head->id)))
continue; continue;
...@@ -1558,7 +1558,7 @@ nv50_disp_super(struct work_struct *work) ...@@ -1558,7 +1558,7 @@ nv50_disp_super(struct work_struct *work)
nv50_disp_super_2_2(disp, head); nv50_disp_super_2_2(disp, head);
} }
} else } else
if (disp->super & 0x00000040) { if (disp->super.pending & 0x00000040) {
list_for_each_entry(head, &disp->heads, head) { list_for_each_entry(head, &disp->heads, head) {
if (!(super & (0x00000080 << head->id))) if (!(super & (0x00000080 << head->id)))
continue; continue;
...@@ -1651,9 +1651,9 @@ nv50_disp_intr(struct nvkm_disp *disp) ...@@ -1651,9 +1651,9 @@ nv50_disp_intr(struct nvkm_disp *disp)
} }
if (intr1 & 0x00000070) { if (intr1 & 0x00000070) {
disp->super = (intr1 & 0x00000070); disp->super.pending = (intr1 & 0x00000070);
queue_work(disp->wq, &disp->supervisor); queue_work(disp->super.wq, &disp->super.work);
nvkm_wr32(device, 0x610024, disp->super); nvkm_wr32(device, 0x610024, disp->super.pending);
} }
} }
...@@ -1795,8 +1795,8 @@ nv50_disp_dtor(struct nvkm_disp *disp) ...@@ -1795,8 +1795,8 @@ nv50_disp_dtor(struct nvkm_disp *disp)
nvkm_gpuobj_del(&disp->inst); nvkm_gpuobj_del(&disp->inst);
nvkm_event_fini(&disp->uevent); nvkm_event_fini(&disp->uevent);
if (disp->wq) if (disp->super.wq)
destroy_workqueue(disp->wq); destroy_workqueue(disp->super.wq);
return disp; return disp;
} }
...@@ -1841,11 +1841,11 @@ nv50_disp_new_(const struct nvkm_disp_func *func, struct nvkm_device *device, ...@@ -1841,11 +1841,11 @@ nv50_disp_new_(const struct nvkm_disp_func *func, struct nvkm_device *device,
if (ret) if (ret)
return ret; return ret;
disp->wq = create_singlethread_workqueue("nvkm-disp"); disp->super.wq = create_singlethread_workqueue("nvkm-disp");
if (!disp->wq) if (!disp->super.wq)
return -ENOMEM; return -ENOMEM;
INIT_WORK(&disp->supervisor, func->super); INIT_WORK(&disp->super.work, func->super);
return nvkm_event_init(func->uevent, 1, ARRAY_SIZE(disp->chan), return nvkm_event_init(func->uevent, 1, ARRAY_SIZE(disp->chan),
&disp->uevent); &disp->uevent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7