| Message ID | 20230325172719.92102-1-arthurgrillo@riseup.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915/overlay: Remove redundant drm_rect_visible() use | expand |
On Sat, Mar 25, 2023 at 02:27:19PM -0300, Arthur Grillo wrote: > The drm_rect_intersect() already returns if the intersection is visible > or not, so the use of drm_rect_visible() is duplicate. > > Signed-off-by: Arthur Grillo <arthurgrillo@riseup.net> Sorry, looks like I completely missed this. Now push the drm-intel-next. Thanks. > --- > v1->v2: https://lore.kernel.org/all/20230324142533.6357-1-arthurgrillo@riseup.net/ > - Split the if condition. > --- > drivers/gpu/drm/i915/display/intel_overlay.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c > index c12bdca8da9b..d55153587cae 100644 > --- a/drivers/gpu/drm/i915/display/intel_overlay.c > +++ b/drivers/gpu/drm/i915/display/intel_overlay.c > @@ -966,10 +966,11 @@ static int check_overlay_dst(struct intel_overlay *overlay, > rec->dst_width, rec->dst_height); > > clipped = req; > - drm_rect_intersect(&clipped, &crtc_state->pipe_src); > > - if (!drm_rect_visible(&clipped) || > - !drm_rect_equals(&clipped, &req)) > + if (!drm_rect_intersect(&clipped, &crtc_state->pipe_src)) > + return -EINVAL; > + > + if (!drm_rect_equals(&clipped, &req)) > return -EINVAL; > > return 0; > -- > 2.39.2
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c index c12bdca8da9b..d55153587cae 100644 --- a/drivers/gpu/drm/i915/display/intel_overlay.c +++ b/drivers/gpu/drm/i915/display/intel_overlay.c @@ -966,10 +966,11 @@ static int check_overlay_dst(struct intel_overlay *overlay, rec->dst_width, rec->dst_height); clipped = req; - drm_rect_intersect(&clipped, &crtc_state->pipe_src); - if (!drm_rect_visible(&clipped) || - !drm_rect_equals(&clipped, &req)) + if (!drm_rect_intersect(&clipped, &crtc_state->pipe_src)) + return -EINVAL; + + if (!drm_rect_equals(&clipped, &req)) return -EINVAL; return 0;
The drm_rect_intersect() already returns if the intersection is visible or not, so the use of drm_rect_visible() is duplicate. Signed-off-by: Arthur Grillo <arthurgrillo@riseup.net> --- v1->v2: https://lore.kernel.org/all/20230324142533.6357-1-arthurgrillo@riseup.net/ - Split the if condition. --- drivers/gpu/drm/i915/display/intel_overlay.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)