diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:30 +1000 |
| commit | b05d873808c77fedd25130b0355acc0da1c11e19 (patch) | |
| tree | 490bd4aa3d48cafe62f966c8060b9da5ed9b54e5 /drivers/gpu/drm/nouveau/dispnv50/base507c.c | |
| parent | drm/nouveau/kms/nv50-: handle degamma LUT from window channels (diff) | |
| download | linux-dev-b05d873808c77fedd25130b0355acc0da1c11e19.tar.xz linux-dev-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/base507c.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/base507c.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c index 5d664d75b645..d5e295ca2caa 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c +++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c @@ -67,8 +67,9 @@ base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) evo_data(push, 0x00000000); evo_data(push, asyw->image.h << 16 | asyw->image.w); evo_data(push, asyw->image.layout << 20 | - asyw->image.pitch[0] | - asyw->image.block); + (asyw->image.pitch[0] >> 8) << 8 | + asyw->image.blocks[0] << 8 | + asyw->image.blockh); evo_data(push, asyw->image.kind << 16 | asyw->image.format << 8); evo_kick(push, &wndw->wndw); |