Merge tag 'drm-fixes-2020-05-29-1' of git://anongit.freedesktop.org/drm/drm (86e43b8b) · Commits · 戴 / test

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;
		}

+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);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -328,8 +328,8 @@ static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc,
		if (!drm_atomic_crtc_needs_modeset(state))
		return 0;

		if (state->mode.hdisplay > priv->soc_info->max_height \|\|
		state->mode.vdisplay > priv->soc_info->max_width)
		if (state->mode.hdisplay > priv->soc_info->max_width \|\|
		state->mode.vdisplay > priv->soc_info->max_height)
		return -EINVAL;

		rate = clk_round_rate(priv->pix_clk,
		@@ -474,7 +474,7 @@ static int ingenic_drm_encoder_atomic_check(struct drm_encoder *encoder,

		static irqreturn_t ingenic_drm_irq_handler(int irq, void *arg)
		{
		struct ingenic_drm *priv = arg;
		struct ingenic_drm *priv = drm_device_get_priv(arg);
		unsigned int state;

		regmap_read(priv->map, JZ_REG_LCD_STATE, &state);