Commit ed52a9b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.7-2020-05-27' of... 

Merge tag 'amd-drm-fixes-5.7-2020-05-27' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.7-2020-05-27:

amdgpu:
- Display atomic test fix
- Fix soft hang in display vupdate code

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200527222700.4378-1-alexander.deucher@amd.com
parents 9cb1fd0e 4e518320

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

+0 −7
Original line number Diff line number Diff line
@@ -7880,13 +7880,6 @@ static int dm_update_plane_state(struct dc *dc, 
			return -EINVAL;

		}



		if (new_plane_state->crtc_x <= -new_acrtc->max_cursor_width ||

			new_plane_state->crtc_y <= -new_acrtc->max_cursor_height) {

			DRM_DEBUG_ATOMIC("Bad cursor position %d, %d\n",

							 new_plane_state->crtc_x, new_plane_state->crtc_y);

			return -EINVAL;

		}



		return 0;

	}

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+2 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,8 @@ static void delay_cursor_until_vupdate(struct dc *dc, struct pipe_ctx *pipe_ctx) 
		return;



	/* Stall out until the cursor update completes. */

	if (vupdate_end < vupdate_start)

		vupdate_end += stream->timing.v_total;

	us_vupdate = (vupdate_end - vupdate_start + 1) * us_per_line;

	udelay(us_to_vupdate + us_vupdate);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE