diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-16 14:38:44 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-17 09:50:38 +1000 |
| commit | 4391d7f5c79a9fe6fa11cf6c160ca7f7bdb49d2a (patch) | |
| tree | 8d640a872ed7d7fce70503b3d7c607d3fc24626a /drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h | |
| parent | 3a6536c51d5db3adf58dcd466a3aee6233b58544 (diff) | |
| download | linux-4391d7f5c79a9fe6fa11cf6c160ca7f7bdb49d2a.tar.bz2 | |
drm/nouveau/disp/nv50-: split chid into chid.ctrl and chid.user
GP102/GP104 make life difficult by redefining the channel indices for
some registers, but not others.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h index f5f683d9fd20..de8db9cfe87d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h @@ -7,7 +7,11 @@ struct nv50_disp_chan { const struct nv50_disp_chan_func *func; const struct nv50_disp_chan_mthd *mthd; struct nv50_disp_root *root; - int chid; + + struct { + int ctrl; + int user; + } chid; int head; struct nvkm_object object; |