Re: [PATCH v2 09/17] drm: Flatten drm_mode_vrefresh()

2020-04-07 Thread Sam Ravnborg
On Fri, Apr 03, 2020 at 11:40:00PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä 
> 
> Remove the pointless whole-function indentation. Also don't
> need to worry about negative values anymore since we switched
> everything to u16.
> 
> Reviewed-by: Emil Velikov 
> Signed-off-by: Ville Syrjälä 

First change could have been in the patch that made this check
pointless. But this works too.

Reviewed-by: Sam Ravnborg 

> ---
>  drivers/gpu/drm/drm_modes.c | 26 --
>  1 file changed, 12 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index 77d68120931a..f2865f88bd54 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -757,24 +757,22 @@ EXPORT_SYMBOL(drm_mode_set_name);
>   */
>  int drm_mode_vrefresh(const struct drm_display_mode *mode)
>  {
> - int refresh = 0;
> + unsigned int num, den;
>  
> - if (mode->htotal > 0 && mode->vtotal > 0) {
> - unsigned int num, den;
> + if (mode->htotal == 0 || mode->vtotal == 0)
> + return 0;
>  
> - num = mode->clock * 1000;
> - den = mode->htotal * mode->vtotal;
> + num = mode->clock * 1000;
> + den = mode->htotal * mode->vtotal;
>  
> - if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> - num *= 2;
> - if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
> - den *= 2;
> - if (mode->vscan > 1)
> - den *= mode->vscan;
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + num *= 2;
> + if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
> + den *= 2;
> + if (mode->vscan > 1)
> + den *= mode->vscan;
>  
> - refresh = DIV_ROUND_CLOSEST(num, den);
> - }
> - return refresh;
> + return DIV_ROUND_CLOSEST(num, den);
>  }
>  EXPORT_SYMBOL(drm_mode_vrefresh);
>  
> -- 
> 2.24.1
> 
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCH v2 09/17] drm: Flatten drm_mode_vrefresh()

2020-04-03 Thread Ville Syrjala
From: Ville Syrjälä 

Remove the pointless whole-function indentation. Also don't
need to worry about negative values anymore since we switched
everything to u16.

Reviewed-by: Emil Velikov 
Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/drm_modes.c | 26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 77d68120931a..f2865f88bd54 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -757,24 +757,22 @@ EXPORT_SYMBOL(drm_mode_set_name);
  */
 int drm_mode_vrefresh(const struct drm_display_mode *mode)
 {
-   int refresh = 0;
+   unsigned int num, den;
 
-   if (mode->htotal > 0 && mode->vtotal > 0) {
-   unsigned int num, den;
+   if (mode->htotal == 0 || mode->vtotal == 0)
+   return 0;
 
-   num = mode->clock * 1000;
-   den = mode->htotal * mode->vtotal;
+   num = mode->clock * 1000;
+   den = mode->htotal * mode->vtotal;
 
-   if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-   num *= 2;
-   if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-   den *= 2;
-   if (mode->vscan > 1)
-   den *= mode->vscan;
+   if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+   num *= 2;
+   if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+   den *= 2;
+   if (mode->vscan > 1)
+   den *= mode->vscan;
 
-   refresh = DIV_ROUND_CLOSEST(num, den);
-   }
-   return refresh;
+   return DIV_ROUND_CLOSEST(num, den);
 }
 EXPORT_SYMBOL(drm_mode_vrefresh);
 
-- 
2.24.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel