diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 15:45:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:09:00 +1000 |
| commit | cf2f05d30dacab32e6866347be6cbfa4030b33b7 (patch) | |
| tree | ab7ca861cc3e92aefa60ba4e9ac1573aaf81331d /drivers/gpu/drm/radeon/atombios_crtc.c | |
| parent | d3f420d1089169fb48366e1aa750bdd92db0a04b (diff) | |
| download | blackbird-op-linux-cf2f05d30dacab32e6866347be6cbfa4030b33b7.tar.gz blackbird-op-linux-cf2f05d30dacab32e6866347be6cbfa4030b33b7.zip | |
drm/radeon/kms: fix avivo tiling regression since radeon object rework
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index fba3c96b915b..6d82417fb903 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -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; |
