Skip to content

Commit

Permalink
drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Jul 8, 2015
1 parent 232fd93 commit 8df5dd5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/i915/intel_fbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 8df5dd5

Please sign in to comment.