All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org,
	sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/rect: remove useless call to clamp_t
Date: Wed, 20 Nov 2019 17:22:34 +0200	[thread overview]
Message-ID: <20191120152234.GG1208@intel.com> (raw)
In-Reply-To: <20191119133435.22525-1-benjamin.gaignard@st.com>

On Tue, Nov 19, 2019 at 02:34:35PM +0100, Benjamin Gaignard wrote:
> Clamping a value between INT_MIN and INT_MAX always return the value itself
> and generate warnings when compiling with W=1.
> 
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
> ---
>  drivers/gpu/drm/drm_rect.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
> index b8363aaa9032..681f1fd09357 100644
> --- a/drivers/gpu/drm/drm_rect.c
> +++ b/drivers/gpu/drm/drm_rect.c
> @@ -89,7 +89,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_w = clip_scaled(drm_rect_width(src),
>  					    drm_rect_width(dst), diff);

Hmm. I think we borked this a bit when introducing clip_scaled().
'diff' can exceed dst width here so clip_scaled() should be able to
return a negative value.

Probably we should make this more consistent and do something like:
        diff = clip->x1 - dst->x1;
        if (diff > 0) {
-               u32 new_src_w = clip_scaled(drm_rect_width(src),
-                                           drm_rect_width(dst), diff);
+               int dst_w, new_src_w;
 
-               src->x1 = clamp_t(int64_t, src->x2 - new_src_w, INT_MIN, INT_MAX);
-               dst->x1 = clip->x1;
+               dst_w = drm_rect_width(dst);
+               diff = min(diff, dst_w);
+               new_src_w = clip_scaled(drm_rect_width(src), dst_w, diff);
+
+               src->x1 = src->x2 - new_src_w;
+               dst->x1 += diff;
        }

etc.

>  
> -		src->x1 = clamp_t(int64_t, src->x2 - new_src_w, INT_MIN, INT_MAX);
> +		src->x1 = src->x2 - new_src_w;
>  		dst->x1 = clip->x1;
>  	}
>  	diff = clip->y1 - dst->y1;
> @@ -97,7 +97,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_h = clip_scaled(drm_rect_height(src),
>  					    drm_rect_height(dst), diff);
>  
> -		src->y1 = clamp_t(int64_t, src->y2 - new_src_h, INT_MIN, INT_MAX);
> +		src->y1 = src->y2 - new_src_h;
>  		dst->y1 = clip->y1;
>  	}
>  	diff = dst->x2 - clip->x2;
> @@ -105,7 +105,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_w = clip_scaled(drm_rect_width(src),
>  					    drm_rect_width(dst), diff);
>  
> -		src->x2 = clamp_t(int64_t, src->x1 + new_src_w, INT_MIN, INT_MAX);
> +		src->x2 = src->x1 + new_src_w;
>  		dst->x2 = clip->x2;
>  	}
>  	diff = dst->y2 - clip->y2;
> @@ -113,7 +113,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_h = clip_scaled(drm_rect_height(src),
>  					    drm_rect_height(dst), diff);
>  
> -		src->y2 = clamp_t(int64_t, src->y1 + new_src_h, INT_MIN, INT_MAX);
> +		src->y2 = src->y1 + new_src_h;
>  		dst->y2 = clip->y2;
>  	}
>  
> -- 
> 2.15.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Ville Syrjälä
Intel

WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: airlied@linux.ie, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org, sean@poorly.run
Subject: Re: [PATCH] drm/rect: remove useless call to clamp_t
Date: Wed, 20 Nov 2019 17:22:34 +0200	[thread overview]
Message-ID: <20191120152234.GG1208@intel.com> (raw)
Message-ID: <20191120152234.2aO4oPtrIQ79y3hHWlChh8UtvvilhG4cEfu4xxjFf0s@z> (raw)
In-Reply-To: <20191119133435.22525-1-benjamin.gaignard@st.com>

On Tue, Nov 19, 2019 at 02:34:35PM +0100, Benjamin Gaignard wrote:
> Clamping a value between INT_MIN and INT_MAX always return the value itself
> and generate warnings when compiling with W=1.
> 
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
> ---
>  drivers/gpu/drm/drm_rect.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
> index b8363aaa9032..681f1fd09357 100644
> --- a/drivers/gpu/drm/drm_rect.c
> +++ b/drivers/gpu/drm/drm_rect.c
> @@ -89,7 +89,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_w = clip_scaled(drm_rect_width(src),
>  					    drm_rect_width(dst), diff);

Hmm. I think we borked this a bit when introducing clip_scaled().
'diff' can exceed dst width here so clip_scaled() should be able to
return a negative value.

Probably we should make this more consistent and do something like:
        diff = clip->x1 - dst->x1;
        if (diff > 0) {
-               u32 new_src_w = clip_scaled(drm_rect_width(src),
-                                           drm_rect_width(dst), diff);
+               int dst_w, new_src_w;
 
-               src->x1 = clamp_t(int64_t, src->x2 - new_src_w, INT_MIN, INT_MAX);
-               dst->x1 = clip->x1;
+               dst_w = drm_rect_width(dst);
+               diff = min(diff, dst_w);
+               new_src_w = clip_scaled(drm_rect_width(src), dst_w, diff);
+
+               src->x1 = src->x2 - new_src_w;
+               dst->x1 += diff;
        }

etc.

>  
> -		src->x1 = clamp_t(int64_t, src->x2 - new_src_w, INT_MIN, INT_MAX);
> +		src->x1 = src->x2 - new_src_w;
>  		dst->x1 = clip->x1;
>  	}
>  	diff = clip->y1 - dst->y1;
> @@ -97,7 +97,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_h = clip_scaled(drm_rect_height(src),
>  					    drm_rect_height(dst), diff);
>  
> -		src->y1 = clamp_t(int64_t, src->y2 - new_src_h, INT_MIN, INT_MAX);
> +		src->y1 = src->y2 - new_src_h;
>  		dst->y1 = clip->y1;
>  	}
>  	diff = dst->x2 - clip->x2;
> @@ -105,7 +105,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_w = clip_scaled(drm_rect_width(src),
>  					    drm_rect_width(dst), diff);
>  
> -		src->x2 = clamp_t(int64_t, src->x1 + new_src_w, INT_MIN, INT_MAX);
> +		src->x2 = src->x1 + new_src_w;
>  		dst->x2 = clip->x2;
>  	}
>  	diff = dst->y2 - clip->y2;
> @@ -113,7 +113,7 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
>  		u32 new_src_h = clip_scaled(drm_rect_height(src),
>  					    drm_rect_height(dst), diff);
>  
> -		src->y2 = clamp_t(int64_t, src->y1 + new_src_h, INT_MIN, INT_MAX);
> +		src->y2 = src->y1 + new_src_h;
>  		dst->y2 = clip->y2;
>  	}
>  
> -- 
> 2.15.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-11-20 15:22 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-19 13:34 [PATCH] drm/rect: remove useless call to clamp_t Benjamin Gaignard
2019-11-19 13:34 ` Benjamin Gaignard
2019-11-19 13:34 ` Benjamin Gaignard
2019-11-20 14:18 ` Jani Nikula
2019-11-20 14:18   ` Jani Nikula
2019-11-20 14:18   ` Jani Nikula
2019-11-20 15:22 ` Ville Syrjälä [this message]
2019-11-20 15:22   ` Ville Syrjälä
2019-11-20 16:25   ` Ville Syrjälä
2019-11-20 16:25     ` Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191120152234.GG1208@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=airlied@linux.ie \
    --cc=benjamin.gaignard@st.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=sean@poorly.run \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.