diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2015-07-07 15:26:08 -0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-08 11:40:33 +0200 |
| commit | 8df5dd57fd2f4e7f02793457a3bd61e5d4a644d5 (patch) | |
| tree | ec6ac5d00535f60cd73bdd5250b3346088d5190b /drivers/gpu/drm/i915 | |
| parent | 232fd934a4b458e5a0dacdd17efc1faffb9df615 (diff) | |
drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 790edb3a2f39..c271af767981 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -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); |