[PATCH 04/12] gpu/drm: ingenic: Fix bogus crtc_atomic_check callback
Paul Cercueil
paul at crapouillou.net
Sun May 17 12:19:14 UTC 2020
Hi Sam,
Le dim. 17 mai 2020 à 8:17, Sam Ravnborg <sam at ravnborg.org> a écrit :
> On Sat, May 16, 2020 at 11:50:49PM +0200, Paul Cercueil wrote:
>> The code was comparing the SoC's maximum height with the mode's
>> width,
>> and vice-versa. D'oh.
>>
>> Cc: stable at vger.kernel.org # v5.6
>> Fixes: a7c909b7c037 ("gpu/drm: ingenic: Check for display size in
>> CRTC atomic check")
>> Signed-off-by: Paul Cercueil <paul at crapouillou.net>
>
> Looks correct.
> Acked-by: Sam Ravnborg <sam at ravnborg.org>
Pushed to drm-misc-fixes, thanks for the review.
-Paul
>> ---
>>
>> Notes:
>> This patch was previously sent standalone.
>> I marked it as superseded in patchwork.
>> Nothing has been changed here.
>>
>> drivers/gpu/drm/ingenic/ingenic-drm.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c
>> b/drivers/gpu/drm/ingenic/ingenic-drm.c
>> index 632d72177123..0c472382a08b 100644
>> --- a/drivers/gpu/drm/ingenic/ingenic-drm.c
>> +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c
>> @@ -330,8 +330,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,
>> --
>> 2.26.2
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list