diff options
| author | Jordan Lazare <Jordan.Lazare@amd.com> | 2017-04-11 11:40:18 -0400 |
|---|---|---|
| committer | Harry Wentland <harry.wentland@amd.com> | 2017-04-19 13:33:01 -0400 |
| commit | 5ac51023d27596cc516839c02c99f09fca6daf2d (patch) | |
| tree | 8f85b654f6a030ea7854d7be2eedab85787c933b | |
| parent | 2c68e0d608e0520697e44f86d6547ef27bbd5537 (diff) | |
drm/amd/display: Fix missing irq refactor causing potential i2c race
Change-Id: I3bd022ac9de6a68ba937d4df6396c0c90417eb5c
Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 15 |
1 files 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 60baeca277fb..cff7c598ac11 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" @@ -3230,13 +3232,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; } |