check_overlay_dst for clipped is called 2 times: in drm_rect_intersect and than directly. Change second call for check of drm_rect_intersect result to save some time (in locked code section).

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 8d8b2dd3995f ("drm/i915: Make the PIPESRC rect relative to the entire bigjoiner area")
Signed-off-by: Nikita Kiryushin <kiryus...@ancud.ru>
---
 drivers/gpu/drm/i915/display/intel_overlay.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 2b1392d5a902..1cda1c163a92 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -972,9 +972,8 @@ 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) ||
+       if (!drm_rect_intersect(&clipped, &crtc_state->pipe_src) ||
            !drm_rect_equals(&clipped, &req))
                return -EINVAL;
 -- 2.34.1

Reply via email to