]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/radeon/kms: fix avivo tiling regression since radeon object rework
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 05:45:13 +0000 (15:45 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Dec 2009 05:09:00 +0000 (15:09 +1000)
The object rework moved the tiling flag setup around wrongly,
so tiling we getting setup then overwritten by fb format.

Fixes regression with drm-radeon-next on rv530 laptop tiling test.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/atombios_crtc.c

index fba3c96b915b45ffeaa741f9fb1136e9deb2aa19..6d82417fb903a39f512feee72a0512facb2a7ebe 100644 (file)
@@ -599,8 +599,6 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
        }
        radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
        radeon_bo_unreserve(rbo);
-       if (tiling_flags & RADEON_TILING_MACRO)
-               fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
 
        switch (crtc->fb->bits_per_pixel) {
        case 8:
@@ -630,6 +628,9 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
                return -EINVAL;
        }
 
+       if (tiling_flags & RADEON_TILING_MACRO)
+               fb_format |= AVIVO_D1GRPH_MACRO_ADDRESS_MODE;
+
        if (tiling_flags & RADEON_TILING_MICRO)
                fb_format |= AVIVO_D1GRPH_TILED;