Attachment 77614 Details for Bug 62889 – possible fix

[patch] possible fix

0001-drm-radeon-add-missing-display-reg-for-tiling-setup.patch (text/plain), 2.63 KB, created by Alex Deucher on 2013-04-08 16:45:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-04-08 16:45:55 UTC

Size: 2.63 KB

patch

obsolete

>From 4848fb75d301e4aded3963dbd364f1b409bf69fa Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Fri, 5 Apr 2013 10:28:08 -0400
>Subject: [PATCH] drm/radeon: add missing display reg for tiling setup
>
>A new tiling config register for the display blocks was
>added on SI.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=62889
>https://bugs.freedesktop.org/show_bug.cgi?id=57919
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/ni.c  |    2 ++
> drivers/gpu/drm/radeon/nid.h |    4 ++++
> drivers/gpu/drm/radeon/si.c  |    1 +
> drivers/gpu/drm/radeon/sid.h |    2 ++
> 4 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index 27769e7..02e9580 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -621,6 +621,8 @@ static void cayman_gpu_init(struct radeon_device *rdev)
> 
> 	WREG32(GB_ADDR_CONFIG, gb_addr_config);
> 	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
>+	if (ASIC_IS_DCE6(rdev))
>+		WREG32(DMIF_ADDR_CALC, gb_addr_config);
> 	WREG32(HDP_ADDR_CONFIG, gb_addr_config);
> 	WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config);
> 	WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config);
>diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h
>index 079dee2..445b235 100644
>--- a/drivers/gpu/drm/radeon/nid.h
>+++ b/drivers/gpu/drm/radeon/nid.h
>@@ -45,6 +45,10 @@
> #define ARUBA_GB_ADDR_CONFIG_GOLDEN        0x12010001
> 
> #define DMIF_ADDR_CONFIG  				0xBD4
>+
>+/* DCE6 only */
>+#define DMIF_ADDR_CALC  				0xC00
>+
> #define	SRBM_GFX_CNTL				        0x0E44
> #define		RINGID(x)					(((x) & 0x3) << 0)
> #define		VMID(x)						(((x) & 0x7) << 0)
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index 862b52c..ace45da 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -1765,6 +1765,7 @@ static void si_gpu_init(struct radeon_device *rdev)
> 
> 	WREG32(GB_ADDR_CONFIG, gb_addr_config);
> 	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
>+	WREG32(DMIF_ADDR_CALC, gb_addr_config);
> 	WREG32(HDP_ADDR_CONFIG, gb_addr_config);
> 	WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config);
> 	WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config);
>diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h
>index 23fc08f..f84cff0 100644
>--- a/drivers/gpu/drm/radeon/sid.h
>+++ b/drivers/gpu/drm/radeon/sid.h
>@@ -65,6 +65,8 @@
> 
> #define DMIF_ADDR_CONFIG  				0xBD4
> 
>+#define DMIF_ADDR_CALC  				0xC00
>+
> #define	SRBM_STATUS				        0xE50
> #define		GRBM_RQ_PENDING 			(1 << 5)
> #define		VMC_BUSY 				(1 << 8)
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 62889: 77180 | 77181 | 77182 | 77183 | 77279 | 77335 | 77336 | 77614 | 78533

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.