Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df5dd57 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 232fd934

drivers/gpu/drm/i915/intel_fbc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);