drm/nvd0/disp: they moved the linear flag..

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-07-06 09:59:40 +10:00
parent 438d99e3b1
commit 2fad3d5e2b
1 changed files with 6 additions and 3 deletions

View File

@ -105,9 +105,12 @@ nouveau_framebuffer_init(struct drm_device *dev,
if (dev_priv->chipset == 0x50) if (dev_priv->chipset == 0x50)
nv_fb->r_format |= (tile_flags << 8); nv_fb->r_format |= (tile_flags << 8);
if (!tile_flags) if (!tile_flags) {
nv_fb->r_pitch = 0x00100000 | fb->pitch; if (dev_priv->card_type < NV_D0)
else { nv_fb->r_pitch = 0x00100000 | fb->pitch;
else
nv_fb->r_pitch = 0x01000000 | fb->pitch;
} else {
u32 mode = nvbo->tile_mode; u32 mode = nvbo->tile_mode;
if (dev_priv->card_type >= NV_C0) if (dev_priv->card_type >= NV_C0)
mode >>= 4; mode >>= 4;