drm/i915/fbc: Move stuff from intel_fbc_can_enable() into intel_fbc_check_plane()

Don't really see a good reason why we can't just do the vgpu and
modparam checks already in intel_fbc_check_plane().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211124113652.22090-15-ville.syrjala@linux.intel.com
Reviewed-by: Mika Kahola <mika.kahola@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 1daf4f7b5d80c88936f73214273411b789ddc63e..616ab95766b2e8e64d39a5f28a18f08b0d5adfc1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -996,18 +996,6 @@ static bool intel_fbc_cfb_size_changed(struct intel_fbc *fbc)
 
 static bool intel_fbc_can_enable(struct intel_fbc *fbc)
 {
-       struct drm_i915_private *i915 = fbc->i915;
-
-       if (intel_vgpu_active(i915)) {
-               fbc->no_fbc_reason = "VGPU is active";
-               return false;
-       }
-
-       if (!i915->params.enable_fbc) {
-               fbc->no_fbc_reason = "disabled per module param or by default";
-               return false;
-       }
-
        if (fbc->underrun_detected) {
                fbc->no_fbc_reason = "underrun detected";
                return false;
@@ -1030,6 +1018,16 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
        if (!fbc)
                return 0;
 
+       if (intel_vgpu_active(i915)) {
+               plane_state->no_fbc_reason = "VGPU active";
+               return 0;
+       }
+
+       if (!i915->params.enable_fbc) {
+               plane_state->no_fbc_reason = "disabled per module param or by default";
+               return 0;
+       }
+
        if (!plane_state->uapi.visible) {
                plane_state->no_fbc_reason = "plane not visible";
                return 0;