Commit 052eaf6a authored by Wayne Lin's avatar Wayne Lin Committed by Alex Deucher
Browse files

drm/amd/display: Revert "drm/amd/display: turn DPMS off on connector unplug" 



This reverts commit 3c4d55c9b9becedd8d31a7c96783a364533713ab.

Revert the commit because:
- It's incomplete of the function dm_set_dpms_off() for mst case.  For
  stream sinks whithin the same mst topology, they share the same dc_link.
  dm_set_dpms_off() tries to update one mst stream only which is
  incomplete.
- 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.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarAurabindo Jayamohanan Pillai <Aurabindo.Pillai@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarWayne Lin <Wayne.Lin@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 10a36226

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

+0 −31
Original line number Diff line number Diff line
@@ -2583,33 +2583,6 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, 
	return;

}



static void dm_set_dpms_off(struct dc_link *link)

{

	struct dc_stream_state *stream_state;

	struct amdgpu_dm_connector *aconnector = link->priv;

	struct amdgpu_device *adev = drm_to_adev(aconnector->base.dev);

	struct dc_stream_update stream_update;

	bool dpms_off = true;



	memset(&stream_update, 0, sizeof(stream_update));

	stream_update.dpms_off = &dpms_off;



	mutex_lock(&adev->dm.dc_lock);

	stream_state = dc_stream_find_from_link(link);



	if (stream_state == NULL) {

		DRM_DEBUG_DRIVER("Error finding stream state associated with link!\n");

		mutex_unlock(&adev->dm.dc_lock);

		return;

	}



	stream_update.stream = stream_state;

	dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0,

				     stream_state, &stream_update,

				     stream_state->ctx->dc->current_state);

	mutex_unlock(&adev->dm.dc_lock);

}



static int dm_resume(void *handle)

{

	struct amdgpu_device *adev = handle;
@@ -3096,10 +3069,6 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector) 
			drm_kms_helper_connector_hotplug_event(connector);



	} else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {

		if (new_connection_type == dc_connection_none &&

		    aconnector->dc_link->type == dc_connection_none)

			dm_set_dpms_off(aconnector->dc_link);



		amdgpu_dm_update_connector_after_detect(aconnector);



		drm_modeset_lock_all(dev);

drivers/gpu/drm/amd/display/dc/core/dc.c

+0 −13
Original line number Diff line number Diff line
@@ -3325,19 +3325,6 @@ struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i) 
	return NULL;

}



struct dc_stream_state *dc_stream_find_from_link(const struct dc_link *link)

{

	uint8_t i;

	struct dc_context *ctx = link->ctx;



	for (i = 0; i < ctx->dc->current_state->stream_count; i++) {

		if (ctx->dc->current_state->streams[i]->link == link)

			return ctx->dc->current_state->streams[i];

	}



	return NULL;

}



enum dc_irq_source dc_interrupt_to_irq_source(

		struct dc *dc,

		uint32_t src_id,

drivers/gpu/drm/amd/display/dc/dc_stream.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ void dc_stream_log(const struct dc *dc, const struct dc_stream_state *stream); 


uint8_t dc_get_current_stream_count(struct dc *dc);

struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i);

struct dc_stream_state *dc_stream_find_from_link(const struct dc_link *link);



/*

 * Return the current frame counter.