drm/amd/display: Revert "drm/amd/display: Add flag to detect dpms force off during HPD"

Browse source

This reverts commit 035f54969b.

The reverted commit was trying to fix side effect brought by
commit 3c4d55c9b9 ("drm/amd/display: turn DPMS off on connector unplug")

However,
* This reverted commit will have mst case never call dm_set_dpms_off()
  which conflicts the idea of original commit 3c4d55c9b9 ("drm/amd/display: turn DPMS off on connector unplug")
  That's due to dm_crtc_state is always null since the input parameter
  aconnector is the root device (source) of mst topology.  It's not an
  end stream sink within the mst topology.
* Setting dpms off should be triggered by usermode. Besdies, it seems
  usermode does release relevant resource for mst & non-mst case when
  unplug connecotr now. Which means we no longer need both commits now:
  commit 3c4d55c9b9 ("drm/amd/display: turn DPMS off on connector unplug")
  commit 035f54969b ("drm/amd/display: Add flag to detect dpms force off during HPD")

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Aurabindo Jayamohanan Pillai <Aurabindo.Pillai@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Wayne Lin 2022-04-13 15:52:48 +08:00 • committed by Alex Deucher

parent 4dd905fd94

commit 10a3622615

3 changed files with 11 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

19

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

2

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

View file

15

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

View file