drm/radeon: don't mess with hot plug detect for eDP or LVDS (rhbz 726143)

This commit is contained in:
Justin M. Forbes 2012-05-04 10:31:52 -05:00
parent ba63b0eddb
commit 35223b7f9c
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,38 @@
From 0971d87045f5052de9f16f3b1aa0dce59f59a060 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Thu, 3 May 2012 19:05:40 -0400
Subject: [PATCH] drm/radeon: don't mess with hot plug detect for eDP or LVDS
connector
It seems imac pannel doesn't like whe we change the hot plug setup
and then refuse to work. This should fix :
https://bugzilla.redhat.com/show_bug.cgi?id=726143
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
---
drivers/gpu/drm/radeon/r600.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 4fbc590..5fd0490 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -713,6 +713,14 @@ void r600_hpd_init(struct radeon_device *rdev)
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
+ connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
+ /* don't try to enable HDP on eDP or LVDS help to avoid
+ * issue such as:
+ * https://bugzilla.redhat.com/show_bug.cgi?id=726143
+ */
+ continue;
+ }
if (ASIC_IS_DCE3(rdev)) {
u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa);
if (ASIC_IS_DCE32(rdev))
--
1.7.7.6

View File

@ -815,6 +815,9 @@ Patch22015: stable-queue-3.3.5-0502.patch
#rhbz 818820
Patch22016: dl2k-Clean-up-rio_ioctl.patch
#rhbz 726143
Patch22017: 0001-drm-radeon-don-t-mess-with-hot-plug-detect-for-eDP-o.patch
# END OF PATCH DEFINITIONS
%endif
@ -1578,6 +1581,9 @@ ApplyPatch stable-queue-3.3.5-0502.patch
#rhbz 818820
ApplyPatch dl2k-Clean-up-rio_ioctl.patch
#rhbz 726143
ApplyPatch 0001-drm-radeon-don-t-mess-with-hot-plug-detect-for-eDP-o.patch
# END OF PATCH APPLICATIONS
%endif
@ -2432,6 +2438,9 @@ fi
# '-' | |
# '-'
%changelog
* Fri May 04 2012 Justin M. Forbes <jforbes@redhat.com>
- drm/radeon: don't mess with hot plug detect for eDP or LVDS (rhbz 726143)
* Fri May 04 2012 Josh Boyer <jwboyer@redhat.com>
- unfiltered netdev rio_ioctl access by users (rhbz 818820)