Attachment 108842 Details for Bug 85771 – possible fix

[patch] possible fix

0001-drm-radeon-make-sure-mode-init-is-complete-in-bandwi.patch (text/plain), 4.43 KB, created by Alex Deucher on 2014-11-03 15:03:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2014-11-03 15:03:29 UTC

Size: 4.43 KB

patch

obsolete

>From 3f23dd160d41b3f8b32cf1b679a759088dd16f5a Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 3 Nov 2014 09:57:46 -0500
>Subject: [PATCH] drm/radeon: make sure mode init is complete in
> bandwidth_update
>
>The power management code calls into the display code for
>certain things.  If certain power management sysfs attributes
>are called before the driver has finished initializing all of
>the hardware we can run into problems with uninitialized
>modesetting state.  Add a check to make sure modesetting
>init has completed to the bandwidth update callbacks to
>fix this.  Can be triggered by the tlp and laptop start
>up scripts depending on the timing.
>
>bugs:
>https://bugzilla.kernel.org/show_bug.cgi?id=83611
>https://bugs.freedesktop.org/show_bug.cgi?id=85771
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/cik.c       | 3 +++
> drivers/gpu/drm/radeon/evergreen.c | 3 +++
> drivers/gpu/drm/radeon/r100.c      | 3 +++
> drivers/gpu/drm/radeon/rs600.c     | 3 +++
> drivers/gpu/drm/radeon/rs690.c     | 3 +++
> drivers/gpu/drm/radeon/rv515.c     | 3 +++
> drivers/gpu/drm/radeon/si.c        | 3 +++
> 7 files changed, 21 insertions(+)
>
>diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
>index af6c7c5..89c01fa 100644
>--- a/drivers/gpu/drm/radeon/cik.c
>+++ b/drivers/gpu/drm/radeon/cik.c
>@@ -9447,6 +9447,9 @@ void dce8_bandwidth_update(struct radeon_device *rdev)
> 	u32 num_heads = 0, lb_size;
> 	int i;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	for (i = 0; i < rdev->num_crtc; i++) {
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index f37d39d..d1e93eb 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -2345,6 +2345,9 @@ void evergreen_bandwidth_update(struct radeon_device *rdev)
> 	u32 num_heads = 0, lb_size;
> 	int i;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	for (i = 0; i < rdev->num_crtc; i++) {
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index 10f8be0..b53b31a 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -3207,6 +3207,9 @@ void r100_bandwidth_update(struct radeon_device *rdev)
> 	uint32_t pixel_bytes1 = 0;
> 	uint32_t pixel_bytes2 = 0;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	if (rdev->mode_info.crtcs[0]->base.enabled) {
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index 5f6db46..9acb1c3 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -879,6 +879,9 @@ void rs600_bandwidth_update(struct radeon_device *rdev)
> 	u32 d1mode_priority_a_cnt, d2mode_priority_a_cnt;
> 	/* FIXME: implement full support */
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	if (rdev->mode_info.crtcs[0]->base.enabled)
>diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
>index 3462b64..0a2d36e 100644
>--- a/drivers/gpu/drm/radeon/rs690.c
>+++ b/drivers/gpu/drm/radeon/rs690.c
>@@ -579,6 +579,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
> 	u32 d1mode_priority_a_cnt, d1mode_priority_b_cnt;
> 	u32 d2mode_priority_a_cnt, d2mode_priority_b_cnt;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	if (rdev->mode_info.crtcs[0]->base.enabled)
>diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
>index 8a477bf..c55d653 100644
>--- a/drivers/gpu/drm/radeon/rv515.c
>+++ b/drivers/gpu/drm/radeon/rv515.c
>@@ -1277,6 +1277,9 @@ void rv515_bandwidth_update(struct radeon_device *rdev)
> 	struct drm_display_mode *mode0 = NULL;
> 	struct drm_display_mode *mode1 = NULL;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	if (rdev->mode_info.crtcs[0]->base.enabled)
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index eeea5b6..7d5083d 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -2384,6 +2384,9 @@ void dce6_bandwidth_update(struct radeon_device *rdev)
> 	u32 num_heads = 0, lb_size;
> 	int i;
> 
>+	if (!rdev->mode_info.mode_config_initialized)
>+		return;
>+
> 	radeon_update_display_priority(rdev);
> 
> 	for (i = 0; i < rdev->num_crtc; i++) {
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 85771: 108842

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.