Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2f05d3 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
parent d3f420d1

drivers/gpu/drm/radeon/atombios_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -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;