Attachment 94233 Details for Bug 71488 – possible fix

[patch] possible fix

0001-drm-radeon-fix-display-tiling-setup-on-SI.patch (text/plain), 2.00 KB, created by Alex Deucher on 2014-02-17 19:24:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2014-02-17 19:24:58 UTC

Size: 2.00 KB

patch

obsolete

>From 23e2345a136b5e5c744ebbb449ba757142e3c6a4 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 17 Feb 2014 14:16:31 -0500
>Subject: [PATCH] drm/radeon: fix display tiling setup on SI
>
>Apply the same logic as CI to SI for setting up the
>display tiling parameters.  The num banks may vary
>per tiling index just like CI.
>
>Bugs:
>https://bugs.freedesktop.org/show_bug.cgi?id=71488
>https://bugs.freedesktop.org/show_bug.cgi?id=73946
>https://bugs.freedesktop.org/show_bug.cgi?id=74927
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/atombios_crtc.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
>index f0d409d..0d19f4f9 100644
>--- a/drivers/gpu/drm/radeon/atombios_crtc.c
>+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
>@@ -1176,7 +1176,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
> 		evergreen_tiling_fields(tiling_flags, &bankw, &bankh, &mtaspect, &tile_split);
> 
> 		/* Set NUM_BANKS. */
>-		if (rdev->family >= CHIP_BONAIRE) {
>+		if (rdev->family >= CHIP_TAHITI) {
> 			unsigned tileb, index, num_banks, tile_split_bytes;
> 
> 			/* Calculate the macrotile mode index. */
>@@ -1194,13 +1194,14 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
> 				return -EINVAL;
> 			}
> 
>-			num_banks = (rdev->config.cik.macrotile_mode_array[index] >> 6) & 0x3;
>+			if (rdev->family >= CHIP_BONAIRE)
>+				num_banks = (rdev->config.cik.macrotile_mode_array[index] >> 6) & 0x3;
>+			else
>+				num_banks = (rdev->config.si.tile_mode_array[index] >> 20) & 0x3;
> 			fb_format |= EVERGREEN_GRPH_NUM_BANKS(num_banks);
> 		} else {
>-			/* SI and older. */
>-			if (rdev->family >= CHIP_TAHITI)
>-				tmp = rdev->config.si.tile_config;
>-			else if (rdev->family >= CHIP_CAYMAN)
>+			/* NI and older. */
>+			if (rdev->family >= CHIP_CAYMAN)
> 				tmp = rdev->config.cayman.tile_config;
> 			else
> 				tmp = rdev->config.evergreen.tile_config;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 71488: 89018 | 89019 | 89021 | 94233

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.