summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2016-11-11 19:57:35 +0300
committerPaulo Zanoni <paulo.r.zanoni@intel.com>2016-11-14 19:00:29 +0300
commit03e39104d9fd72238264576462138ed4b011b24b (patch)
tree4ca73cf79cb4c3c6a24585f049ee72291f414055
parent4d1368f7faf7949a96fd75fa552ebc9cf4dc4e77 (diff)
downloadlinux-03e39104d9fd72238264576462138ed4b011b24b.tar.xz
drm/i915/fbc: move the intel_fbc_can_choose() call out of the loop
We can just call it earlier, so do it. The goal of the loop is to get the plane's CRTC state, and we don't need it in order to call intel_fbc_can_choose(). Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1478883461-20201-2-git-send-email-paulo.r.zanoni@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_fbc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index e230d480c5e6..ded77bda1e03 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -1096,6 +1096,9 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,
if (!intel_plane_state->base.visible)
continue;
+ if (!intel_fbc_can_choose(to_intel_crtc(plane_state->crtc)))
+ continue;
+
for_each_crtc_in_state(state, crtc, crtc_state, j) {
struct intel_crtc_state *intel_crtc_state =
to_intel_crtc_state(crtc_state);
@@ -1103,9 +1106,6 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv,
if (plane_state->crtc != crtc)
continue;
- if (!intel_fbc_can_choose(to_intel_crtc(crtc)))
- break;
-
intel_crtc_state->enable_fbc = true;
goto out;
}