[PATCH 10/24] drm/amd/display: Fix missing irq refactor causing potential i2c race
Harry Wentland
harry.wentland at amd.com
Tue Apr 25 18:38:59 UTC 2017
From: Jordan Lazare <Jordan.Lazare at amd.com>
Change-Id: I3bd022ac9de6a68ba937d4df6396c0c90417eb5c
Signed-off-by: Jordan Lazare <Jordan.Lazare at amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland at amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
index 36540e1e9281..70826c7739c2 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -31,8 +31,10 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_atomic.h>
+
#include "amdgpu.h"
#include "amdgpu_pm.h"
+#include "dm_helpers.h"
#include "dm_services_types.h"
#include "drm_edid.h"
@@ -3205,13 +3207,16 @@ static bool is_dp_capable_without_timing_msa(
{
uint8_t dpcd_data;
bool capable = false;
+
if (amdgpu_connector->dc_link &&
- dc_read_aux_dpcd(
- dc,
- amdgpu_connector->dc_link->link_index,
- DP_DOWN_STREAM_PORT_COUNT,
- &dpcd_data, sizeof(dpcd_data)))
+ dm_helpers_dp_read_dpcd(
+ NULL,
+ amdgpu_connector->dc_link,
+ DP_DOWN_STREAM_PORT_COUNT,
+ &dpcd_data,
+ sizeof(dpcd_data))) {
capable = (dpcd_data & DP_MSA_TIMING_PAR_IGNORED) ? true:false;
+ }
return capable;
}
--
2.11.0
More information about the amd-gfx
mailing list