Commit ed9244bd authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-fixes-2020-05-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Two ingenic fixes, one for a wrong cast, the other for a typo in a
comparison
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200528110944.hanv4qgc6w7whnj3@gilmour.lan
parents ed52a9b5 abf56fad
...@@ -328,8 +328,8 @@ static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc, ...@@ -328,8 +328,8 @@ static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc,
if (!drm_atomic_crtc_needs_modeset(state)) if (!drm_atomic_crtc_needs_modeset(state))
return 0; return 0;
if (state->mode.hdisplay > priv->soc_info->max_height || if (state->mode.hdisplay > priv->soc_info->max_width ||
state->mode.vdisplay > priv->soc_info->max_width) state->mode.vdisplay > priv->soc_info->max_height)
return -EINVAL; return -EINVAL;
rate = clk_round_rate(priv->pix_clk, rate = clk_round_rate(priv->pix_clk,
...@@ -474,7 +474,7 @@ static int ingenic_drm_encoder_atomic_check(struct drm_encoder *encoder, ...@@ -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) 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; unsigned int state;
regmap_read(priv->map, JZ_REG_LCD_STATE, &state); regmap_read(priv->map, JZ_REG_LCD_STATE, &state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment