From: Dave Airlie Date: Thu, 4 Oct 2018 01:03:34 +0000 (+1000) Subject: BackMerge v4.19-rc6 into drm-next X-Git-Tag: v4.20-rc1~21^2~15 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6004f172b375f5747e89afc62ad3baaf1bebd58a;p=linux-2.6-block.git BackMerge v4.19-rc6 into drm-next I have some pulls based on rc6, and I prefer to have an explicit backmerge. Signed-off-by: Dave Airlie --- 6004f172b375f5747e89afc62ad3baaf1bebd58a diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 715422bb30db,96875950845a..6a2342d72742 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@@ -1010,10 -1010,10 +1098,11 @@@ static void handle_hpd_irq(void *param struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param; struct drm_connector *connector = &aconnector->base; struct drm_device *dev = connector->dev; + enum dc_connection_type new_connection_type = dc_connection_none; - /* In case of failure or MST no need to update connector status or notify the OS - * since (for MST case) MST does this in it's own context. + /* + * In case of failure or MST no need to update connector status or notify the OS + * since (for MST case) MST does this in its own context. */ mutex_lock(&aconnector->hpd_lock); @@@ -1120,9 -1134,9 +1223,10 @@@ static void handle_hpd_rx_irq(void *par struct drm_device *dev = connector->dev; struct dc_link *dc_link = aconnector->dc_link; bool is_mst_root_connector = aconnector->mst_mgr.mst_state; + enum dc_connection_type new_connection_type = dc_connection_none; - /* TODO:Temporary add mutex to protect hpd interrupt not have a gpio + /* + * TODO:Temporary add mutex to protect hpd interrupt not have a gpio * conflict, after implement i2c helper, this mutex should be * retired. */