redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()

Browse source 
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>
This commit is contained in:
Paulo Zanoni 2015-07-07 15:26:08 -03:00 committed by Daniel Vetter
parent 232fd934a4
commit 8df5dd57fd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_fbc.c
View 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);