summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv50/head827d.c
diff options
context:
space:
mode:
authorBen Skeggs2018-05-08 12:39:47 +0200
committerBen Skeggs2018-05-18 07:01:30 +0200
commitb05d873808c77fedd25130b0355acc0da1c11e19 (patch)
tree490bd4aa3d48cafe62f966c8060b9da5ed9b54e5 /drivers/gpu/drm/nouveau/dispnv50/head827d.c
parentdrm/nouveau/kms/nv50-: handle degamma LUT from window channels (diff)
downloadkernel-qcow2-linux-b05d873808c77fedd25130b0355acc0da1c11e19.tar.gz
kernel-qcow2-linux-b05d873808c77fedd25130b0355acc0da1c11e19.tar.xz
kernel-qcow2-linux-b05d873808c77fedd25130b0355acc0da1c11e19.zip
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/head827d.c')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv50/head827d.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
index ddc143bac305..ae33e21790ee 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -64,7 +64,8 @@ head827d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
evo_data(push, asyh->core.h << 16 | asyh->core.w);
evo_data(push, asyh->core.layout << 20 |
(asyh->core.pitch >> 8) << 8 |
- asyh->core.block);
+ asyh->core.blocks << 8 |
+ asyh->core.blockh);
evo_data(push, asyh->core.format << 8);
evo_data(push, asyh->core.handle);
evo_mthd(push, 0x08c0 + head->base.index * 0x400, 1);