summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/dispnv50/atom.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2018-05-08 20:39:47 +1000
committerBen Skeggs <bskeggs@redhat.com>2018-05-18 15:01:30 +1000
commitb05d873808c77fedd25130b0355acc0da1c11e19 (patch)
tree490bd4aa3d48cafe62f966c8060b9da5ed9b54e5 /drivers/gpu/drm/nouveau/dispnv50/atom.h
parent119608a7f3f1ef899f1f98d05306340b92834836 (diff)
drm/nouveau/kms/nv50-: separate blocklinear vs linear pitch
Will be required to support Volta. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/atom.h')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv50/atom.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/atom.h b/drivers/gpu/drm/nouveau/dispnv50/atom.h
index 3e9e8832d0dd..0409947bf196 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/atom.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h
@@ -63,7 +63,8 @@ struct nv50_head_atom {
u8 format;
u8 kind:7;
u8 layout:1;
- u8 block:4;
+ u8 blockh:4;
+ u16 blocks:12;
u32 pitch:20;
u16 x;
u16 y;
@@ -175,7 +176,8 @@ struct nv50_wndw_atom {
u8 format;
u8 kind:7;
u8 layout:1;
- u8 block:4;
+ u8 blockh:4;
+ u16 blocks[3];
u32 pitch[3];
u16 w;
u16 h;