drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Tue, 7 Jul 2015 18:26:08 +0000 (15:26 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 8 Jul 2015 09:40:33 +0000 (11:40 +0200)
So now all the calls are inside __intel_fbc_update(). Consistency!

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_fbc.c

index 790edb3a2f39a5a415e869debe0c16d2cd4ee69a..c271af7679815bedee3623efc869b15de1b551b2 100644 (file)
@@ -509,10 +509,8 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
                        break;
        }
 
-       if (!crtc || crtc->primary->fb == NULL) {
-               set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT);
+       if (!crtc || crtc->primary->fb == NULL)
                return NULL;
-       }
 
        return crtc;
 }
@@ -720,8 +718,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv)
         *   - going to an unsupported config (interlace, pixel multiply, etc.)
         */
        crtc = intel_fbc_find_crtc(dev_priv);
-       if (!crtc)
+       if (!crtc) {
+               set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT);
                goto out_disable;
+       }
 
        if (!multiple_pipes_ok(dev_priv)) {
                set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES);