From b05d873808c77fedd25130b0355acc0da1c11e19 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 8 May 2018 20:39:47 +1000 Subject: drm/nouveau/kms/nv50-: separate blocklinear vs linear pitch Will be required to support Volta. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/dispnv50/head827d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/nouveau/dispnv50/head827d.c') 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); -- cgit v1.2.3-55-g7522