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

Commit 3d739d92 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: add update function to disable/enable-back PSR 



Required function to disable PSR when going to console mode.
But also can be used whenever PSR mode entry conditions changed.

v2: Add it before PSR Hook. Update function not really been called yet.
v3: Fix coding style detected by checkpatch by Paulo Zanoni.
v4: do_enable must be static as Paulo noticed.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarShobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 105b7c11

drivers/gpu/drm/i915/intel_dp.c

+30 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp) 
	return true;

}



void intel_edp_psr_enable(struct intel_dp *intel_dp)

static void intel_edp_psr_do_enable(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);
@@ -1580,6 +1580,15 @@ void intel_edp_psr_enable(struct intel_dp *intel_dp) 
	intel_edp_psr_enable_source(intel_dp);

}



void intel_edp_psr_enable(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);



	if (intel_edp_psr_match_conditions(intel_dp) &&

	    !intel_edp_is_psr_enabled(dev))

		intel_edp_psr_do_enable(intel_dp);

}



void intel_edp_psr_disable(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);
@@ -1596,6 +1605,26 @@ void intel_edp_psr_disable(struct intel_dp *intel_dp) 
		DRM_ERROR("Timed out waiting for PSR Idle State\n");

}



void intel_edp_psr_update(struct drm_device *dev)

{

	struct intel_encoder *encoder;

	struct intel_dp *intel_dp = NULL;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head)

		if (encoder->type == INTEL_OUTPUT_EDP) {

			intel_dp = enc_to_intel_dp(&encoder->base);



			if (!is_edp_psr(intel_dp))

				return;



			if (!intel_edp_psr_match_conditions(intel_dp))

				intel_edp_psr_disable(intel_dp);

			else

				if (!intel_edp_is_psr_enabled(dev))

					intel_edp_psr_do_enable(intel_dp);

		}

}



static void intel_disable_dp(struct intel_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -837,5 +837,6 @@ extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, 


extern void intel_edp_psr_enable(struct intel_dp *intel_dp);

extern void intel_edp_psr_disable(struct intel_dp *intel_dp);

extern void intel_edp_psr_update(struct drm_device *dev);



#endif /* __INTEL_DRV_H__ */