drm/i915/rps: postpone i915 fence check to boost

Make the RPS boost code independent of i915 request code by moving the
dma_fence_is_i915() check to the RPS boost call.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/2653395523ee04c9ca3216f197f08c25a9f7716d.1763370931.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_rps.c b/drivers/gpu/drm/i915/display/intel_display_rps.c
index d639d9152bf5bd89ae96246b9db8ff1e80f52365..e77811396474f8793f172e9c3c7d9628c8883cea 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_rps.c
+++ b/drivers/gpu/drm/i915/display/intel_display_rps.c
@@ -9,7 +9,6 @@
 #include <drm/drm_vblank.h>
 
 #include "i915_reg.h"
-#include "i915_request.h"
 #include "intel_display_core.h"
 #include "intel_display_irq.h"
 #include "intel_display_rps.h"
@@ -54,9 +53,6 @@ void intel_display_rps_boost_after_vblank(struct drm_crtc *crtc,
        if (!intel_parent_rps_available(display))
                return;
 
-       if (!dma_fence_is_i915(fence))
-               return;
-
        if (DISPLAY_VER(display) < 6)
                return;
 

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index c42a1ee42b58aa0ca1dfe5f3f00a370521be6a71..d233dc122bd7cf3357c602ce3dc2961edc6e0047 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -2917,7 +2917,12 @@ EXPORT_SYMBOL_GPL(i915_gpu_turbo_disable);
 
 static void boost_if_not_started(struct dma_fence *fence)
 {
-       struct i915_request *rq = to_request(fence);
+       struct i915_request *rq;
+
+       if (!dma_fence_is_i915(fence))
+               return;
+
+       rq = to_request(fence);
 
        if (!i915_request_started(rq))
                intel_rps_boost(rq);