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

Commit 30c58d58 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Maarten Lankhorst
Browse files

drm/i915: extract crtc_is_valid() on the FBC code 



We're going to kill intel_fbc_find_crtc(), that's why a big part of
the logic moved from intel_fbc_find_crtc() to crtc_is_valid().

v2:
  - Rebase due to pipe_a_only change.
  - Split the multiline conditional (Chris).

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446664257-32012-5-git-send-email-paulo.r.zanoni@intel.com


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent a4dedd5a

drivers/gpu/drm/i915/intel_fbc.c

+17 −5
Original line number Diff line number Diff line
@@ -487,6 +487,22 @@ static void set_no_fbc_reason(struct drm_i915_private *dev_priv, 
	DRM_DEBUG_KMS("Disabling FBC: %s\n", reason);

}



static bool crtc_is_valid(struct intel_crtc *crtc)

{

	struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;



	if (fbc_on_pipe_a_only(dev_priv) && crtc->pipe != PIPE_A)

		return false;



	if (!intel_crtc_active(&crtc->base))

		return false;



	if (!to_intel_plane_state(crtc->base.primary->state)->visible)

		return false;



	return true;

}



static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)

{

	struct drm_crtc *crtc = NULL, *tmp_crtc;
@@ -495,12 +511,8 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv) 
	for_each_pipe(dev_priv, pipe) {

		tmp_crtc = dev_priv->pipe_to_crtc_mapping[pipe];



		if (intel_crtc_active(tmp_crtc) &&

		    to_intel_plane_state(tmp_crtc->primary->state)->visible)

		if (crtc_is_valid(to_intel_crtc(tmp_crtc)))

			crtc = tmp_crtc;



		if (fbc_on_pipe_a_only(dev_priv))

			break;

	}



	if (!crtc)