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

Commit 20ddf665 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Make intel_crtc_active() available outside intel_pm.c 



Move intel_crtc_active() to intel_display.c and make it available
elsewhere as well.

intel_edp_psr_match_conditions() already has one open coded copy,
so replace that one with a call to intel_crtc_active().

v2: Copy paste a big comment from danvet's mail explaining
    when we can ditch the extra checks

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ca73b4f0

drivers/gpu/drm/i915/intel_display.c

+17 −0
Original line number Diff line number Diff line
@@ -733,6 +733,23 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, 
	return true;

}



bool intel_crtc_active(struct drm_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	/* Be paranoid as we can arrive here with only partial

	 * state retrieved from the hardware during setup.

	 *

	 * We can ditch the adjusted_mode.clock check as soon

	 * as Haswell has gained clock readout/fastboot support.

	 *

	 * We can ditch the crtc->fb check as soon as we can

	 * properly reconstruct framebuffers.

	 */

	return intel_crtc->active && crtc->fb &&

		intel_crtc->config.adjusted_mode.clock;

}



enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,

					     enum pipe pipe)

{

drivers/gpu/drm/i915/intel_dp.c

+1 −2
Original line number Diff line number Diff line
@@ -1628,8 +1628,7 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp) 
	}



	intel_crtc = to_intel_crtc(crtc);

	if (!intel_crtc->active || !crtc->fb ||

	    !intel_crtc->config.adjusted_mode.clock) {

	if (!intel_crtc_active(crtc)) {

		DRM_DEBUG_KMS("crtc not active for PSR\n");

		dev_priv->no_psr_reason = PSR_CRTC_NOT_ACTIVE;

		return false;

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -808,4 +808,6 @@ extern int intel_dotclock_calculate(int link_freq, 
extern void ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config,

					    int dotclock);



extern bool intel_crtc_active(struct drm_crtc *crtc);



#endif /* __INTEL_DRV_H__ */

drivers/gpu/drm/i915/intel_pm.c

+0 −11
Original line number Diff line number Diff line
@@ -43,17 +43,6 @@ 
 * i915.i915_enable_fbc parameter

 */



static bool intel_crtc_active(struct drm_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	/* Be paranoid as we can arrive here with only partial

	 * state retrieved from the hardware during setup.

	 */

	return intel_crtc->active && crtc->fb &&

		intel_crtc->config.adjusted_mode.clock;

}



static void i8xx_disable_fbc(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;