Merge tag 'drm-misc-fixes-2020-05-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (ed9244bd) · Commits · 戴 / test

Two ingenic fixes, one for a wrong cast, the other for a typo in a comparison Signed-off-by:

drivers/gpu/drm/ingenic/ingenic-drm.c

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