Re: [PATCH 04/12] gpu/drm: ingenic: Fix bogus crtc_atomic_check callback

2020-05-17 Thread Paul Cercueil 

Hi Sam,

Le dim. 17 mai 2020 à 8:17, Sam Ravnborg  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: sta...@vger.kernel.org # v5.6
 Fixes: a7c909b7c037 ("gpu/drm: ingenic: Check for display size in 
CRTC atomic check")

 Signed-off-by: Paul Cercueil 


Looks correct.
Acked-by: Sam Ravnborg 


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-de...@lists.freedesktop.org
 https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/12] gpu/drm: ingenic: Fix bogus crtc_atomic_check callback

2020-05-17 Thread Sam Ravnborg 
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: sta...@vger.kernel.org # v5.6
> Fixes: a7c909b7c037 ("gpu/drm: ingenic: Check for display size in CRTC atomic 
> check")
> Signed-off-by: Paul Cercueil 

Looks correct.
Acked-by: Sam Ravnborg 
> ---
> 
> 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-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 04/12] gpu/drm: ingenic: Fix bogus crtc_atomic_check callback

2020-05-16 Thread Paul Cercueil 
The code was comparing the SoC's maximum height with the mode's width,
and vice-versa. D'oh.

Cc: sta...@vger.kernel.org # v5.6
Fixes: a7c909b7c037 ("gpu/drm: ingenic: Check for display size in CRTC atomic 
check")
Signed-off-by: Paul Cercueil 
---

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