diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 13:39:47 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 08:01:30 +0300 |
| commit | b05d873808c77fedd25130b0355acc0da1c11e19 (patch) | |
| tree | 490bd4aa3d48cafe62f966c8060b9da5ed9b54e5 /drivers/gpu/drm/nouveau/dispnv50/wndw.c | |
| parent | 119608a7f3f1ef899f1f98d05306340b92834836 (diff) | |
| download | linux-b05d873808c77fedd25130b0355acc0da1c11e19.tar.xz | |
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/wndw.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wndw.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index fbaf8b7ed203..b96dc3d4dab5 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -225,13 +225,15 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, if (asyw->image.kind) { asyw->image.layout = 0; if (drm->client.device.info.chipset >= 0xc0) - asyw->image.block = fb->nvbo->mode >> 4; + asyw->image.blockh = fb->nvbo->mode >> 4; else - asyw->image.block = fb->nvbo->mode; - asyw->image.pitch[0] = (fb->base.pitches[0] / 4) << 4; + asyw->image.blockh = fb->nvbo->mode; + asyw->image.blocks[0] = fb->base.pitches[0] / 64; + asyw->image.pitch[0] = 0; } else { asyw->image.layout = 1; - asyw->image.block = 0; + asyw->image.blockh = 0; + asyw->image.blocks[0] = 0; asyw->image.pitch[0] = fb->base.pitches[0]; } |