drm/i915: extract fbc_on_pipe_a_only()
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 4 Nov 2015 19:10:46 +0000 (17:10 -0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 10 Nov 2015 09:58:34 +0000 (10:58 +0100)
Make the code easier to read.

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446664257-32012-3-git-send-email-paulo.r.zanoni@intel.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
drivers/gpu/drm/i915/intel_fbc.c

index b49a1923e42306ffbafc6c336d5610597fc5c77e..72c336ffdd91bc0c29f49bcbe8b1657ce08a3863 100644 (file)
@@ -46,6 +46,11 @@ static inline bool fbc_supported(struct drm_i915_private *dev_priv)
        return dev_priv->fbc.enable_fbc != NULL;
 }
 
+static inline bool fbc_on_pipe_a_only(struct drm_i915_private *dev_priv)
+{
+       return IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8;
+}
+
 /*
  * In some platforms where the CRTC's x:0/y:0 coordinates doesn't match the
  * frontbuffer's x:0/y:0 coordinates we lie to the hardware about the plane's
@@ -486,10 +491,6 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
 {
        struct drm_crtc *crtc = NULL, *tmp_crtc;
        enum pipe pipe;
-       bool pipe_a_only = false;
-
-       if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)
-               pipe_a_only = true;
 
        for_each_pipe(dev_priv, pipe) {
                tmp_crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@ -498,7 +499,7 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
                    to_intel_plane_state(tmp_crtc->primary->state)->visible)
                        crtc = tmp_crtc;
 
-               if (pipe_a_only)
+               if (fbc_on_pipe_a_only(dev_priv))
                        break;
        }
 
@@ -1057,7 +1058,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)
                dev_priv->fbc.possible_framebuffer_bits |=
                                INTEL_FRONTBUFFER_PRIMARY(pipe);
 
-               if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)
+               if (fbc_on_pipe_a_only(dev_priv))
                        break;
        }