Commit efc8278e authored by Anson Jacob's avatar Anson Jacob Committed by Alex Deucher
Browse files

Revert "drm/amd/display: reuse current context instead of recreating one" 

This reverts commit 8866a67a.

Reason for revert: This breaks hotplug of HDMI on some systems,
resulting in a blank screen. Caused general hangs on boot/hotplugs.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649


Signed-off-by: default avatarAnson Jacob <Anson.Jacob@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <bhawanpreet.lakha@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 7b3d19a7

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

+13 −10
Original line number Diff line number Diff line
@@ -1936,7 +1936,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, 
		dc_commit_updates_for_stream(

			dm->dc, bundle->surface_updates,

			dc_state->stream_status->plane_count,

			dc_state->streams[k], &bundle->stream_update);

			dc_state->streams[k], &bundle->stream_update, dc_state);

	}



cleanup:
@@ -1967,7 +1967,8 @@ static void dm_set_dpms_off(struct dc_link *link) 


	stream_update.stream = stream_state;

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

				     stream_state, &stream_update);

				     stream_state, &stream_update,

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

	mutex_unlock(&adev->dm.dc_lock);

}
@@ -7663,7 +7664,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
				    struct drm_crtc *pcrtc,

				    bool wait_for_vblank)

{

	int i;

	uint32_t i;

	uint64_t timestamp_ns;

	struct drm_plane *plane;

	struct drm_plane_state *old_plane_state, *new_plane_state;
@@ -7704,7 +7705,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
		amdgpu_dm_commit_cursors(state);



	/* update planes when needed */

	for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {

	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {

		struct drm_crtc *crtc = new_plane_state->crtc;

		struct drm_crtc_state *new_crtc_state;

		struct drm_framebuffer *fb = new_plane_state->fb;
@@ -7927,7 +7928,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
						     bundle->surface_updates,

						     planes_count,

						     acrtc_state->stream,

						     &bundle->stream_update);

						     &bundle->stream_update,

						     dc_state);



		/**

		 * Enable or disable the interrupts on the backend.
@@ -8263,13 +8265,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);

		struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);

		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);

		struct dc_surface_update surface_updates[MAX_SURFACES];

		struct dc_surface_update dummy_updates[MAX_SURFACES];

		struct dc_stream_update stream_update;

		struct dc_info_packet hdr_packet;

		struct dc_stream_status *status = NULL;

		bool abm_changed, hdr_changed, scaling_changed;



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

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

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



		if (acrtc) {
@@ -8326,15 +8328,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		 * To fix this, DC should permit updating only stream properties.

		 */

		for (j = 0; j < status->plane_count; j++)

			surface_updates[j].surface = status->plane_states[j];

			dummy_updates[j].surface = status->plane_states[0];





		mutex_lock(&dm->dc_lock);

		dc_commit_updates_for_stream(dm->dc,

						surface_updates,

						     dummy_updates,

						     status->plane_count,

						     dm_new_crtc_state->stream,

						     &stream_update);

						     &stream_update,

						     dc_state);

		mutex_unlock(&dm->dc_lock);

	}

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

+8 −19
Original line number Diff line number Diff line
@@ -2697,7 +2697,8 @@ void dc_commit_updates_for_stream(struct dc *dc, 
		struct dc_surface_update *srf_updates,

		int surface_count,

		struct dc_stream_state *stream,

		struct dc_stream_update *stream_update)

		struct dc_stream_update *stream_update,

		struct dc_state *state)

{

	const struct dc_stream_status *stream_status;

	enum surface_update_type update_type;
@@ -2716,12 +2717,6 @@ void dc_commit_updates_for_stream(struct dc *dc, 




	if (update_type >= UPDATE_TYPE_FULL) {

		struct dc_plane_state *new_planes[MAX_SURFACES];



		memset(new_planes, 0, sizeof(new_planes));



		for (i = 0; i < surface_count; i++)

			new_planes[i] = srf_updates[i].surface;



		/* initialize scratch memory for building context */

		context = dc_create_state(dc);
@@ -2730,21 +2725,15 @@ void dc_commit_updates_for_stream(struct dc *dc, 
			return;

		}



		dc_resource_state_copy_construct(

				dc->current_state, context);

		dc_resource_state_copy_construct(state, context);



		/*remove old surfaces from context */

		if (!dc_rem_all_planes_for_stream(dc, stream, context)) {

			DC_ERROR("Failed to remove streams for new validate context!\n");

			return;

		}

		for (i = 0; i < dc->res_pool->pipe_count; i++) {

			struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i];

			struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i];



		/* add surface to context */

		if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) {

			DC_ERROR("Failed to add streams for new validate context!\n");

			return;

			if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state)

				new_pipe->plane_state->force_full_update = true;

		}



	}

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

+2 −1
Original line number Diff line number Diff line
@@ -294,7 +294,8 @@ void dc_commit_updates_for_stream(struct dc *dc, 
		struct dc_surface_update *srf_updates,

		int surface_count,

		struct dc_stream_state *stream,

		struct dc_stream_update *stream_update);

		struct dc_stream_update *stream_update,

		struct dc_state *state);

/*

 * Log the current stream state.

 */