leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Return hpd_irq_dpcd from hpd_rx handler

Browse Source 
Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Wenjing Liu 2017-07-19 13:18:26 -04:00 committed by Alex Deucher
parent 3d696cbfd4
commit 8ee65d7c93
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -914,7 +914,7 @@ static void handle_hpd_rx_irq(void *param)
if (aconnector->dc_link->type != dc_connection_mst_branch)
mutex_lock(&aconnector->hpd_lock);
if (dc_link_handle_hpd_rx_irq(aconnector->dc_link) &&
if (dc_link_handle_hpd_rx_irq(aconnector->dc_link, NULL) &&
!is_mst_root_connector) {
/* Downstream Port status changed. */
if (dc_link_detect(aconnector->dc_link, false)) {

5
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
View File

@ -1924,7 +1924,7 @@ static void handle_automated_test(struct core_link *link)
sizeof(test_response));
}
bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link)
bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link, union hpd_irq_data *out_hpd_irq_dpcd_data)
{
struct core_link *link = DC_LINK_TO_LINK(dc_link);
union hpd_irq_data hpd_irq_dpcd_data = {{{{0}}}};
@ -1939,12 +1939,15 @@ bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link)
"%s: Got short pulse HPD on link %d\n",
__func__, link->public.link_index);
/* All the "handle_hpd_irq_xxx()" methods
* should be called only after
* dal_dpsst_ls_read_hpd_irq_data
* Order of calls is important too
*/
result = read_hpd_rx_irq_data(link, &hpd_irq_dpcd_data);
if (out_hpd_irq_dpcd_data)
*out_hpd_irq_dpcd_data = hpd_irq_dpcd_data;
if (result != DC_OK) {
dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ,

3
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -755,7 +755,8 @@ bool dc_link_detect(const struct dc_link *dc_link, bool boot);
* detection.
* false - no change in Downstream port status. No further action required
* from DM. */
bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link);
bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link,
union hpd_irq_data *hpd_irq_dpcd_data);
struct dc_sink_init_data;