[Intel-gfx] [PATCH 1/2] drm/i915: Add psr_ready on pipe_config
Ramalingam C
ramalingam.c at intel.com
Mon Mar 30 02:50:57 PDT 2015
Looks good to me..
Reviewed-by: Ramalingam C <ramalingam.c at intel.com>
On Friday 27 March 2015 12:50 AM, Rodrigo Vivi wrote:
> Let's know beforehand if PSR is ready and will be enabled so we can
> prevent DRRS to get enabled.
>
> v2: Removing is_edp_psr func that is not used after this patch.
> Rename match_conditions and document it since it is now external.
> Moving to a propper place as pointed out by Sivakumar.
> Use a better name as pointed out by Ram.
>
> Cc: Sivakumar Thulasimani <sivakumar.thulasimani at intel.com>
> Cc: Ramalingam C <ramalingam.c at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 1 +
> drivers/gpu/drm/i915/intel_dp.c | 2 ++
> drivers/gpu/drm/i915/intel_drv.h | 2 ++
> drivers/gpu/drm/i915/intel_psr.c | 50 +++++++++++++++++++++---------------
> 4 files changed, 35 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 35cdb48..9112ad9 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10367,6 +10367,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
> pipe_config->pch_pfit.pos,
> pipe_config->pch_pfit.size,
> pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
> + DRM_DEBUG_KMS("psr ready: %i\n", pipe_config->psr_ready);
> DRM_DEBUG_KMS("ips: %i\n", pipe_config->ips_enabled);
> DRM_DEBUG_KMS("double wide: %i\n", pipe_config->double_wide);
> }
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 637dd53..e6b1c42 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1388,6 +1388,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> */
> min_lane_count = max_lane_count;
> min_clock = max_clock;
> +
> + pipe_config->psr_ready = intel_psr_ready(intel_dp);
> }
>
> for (; bpp >= 6*3; bpp -= 2*3) {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index c0fa1cb..250d70c 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -384,6 +384,7 @@ struct intel_crtc_state {
> int fdi_lanes;
> struct intel_link_m_n fdi_m_n;
>
> + bool psr_ready;
> bool ips_enabled;
>
> bool double_wide;
> @@ -1206,6 +1207,7 @@ void intel_backlight_unregister(struct drm_device *dev);
>
>
> /* intel_psr.c */
> +bool intel_psr_ready(struct intel_dp *intel_dp);
> void intel_psr_enable(struct intel_dp *intel_dp);
> void intel_psr_disable(struct intel_dp *intel_dp);
> void intel_psr_invalidate(struct drm_device *dev,
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index c1ca923..2f22ab6 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -56,11 +56,6 @@
> #include "intel_drv.h"
> #include "i915_drv.h"
>
> -static bool is_edp_psr(struct intel_dp *intel_dp)
> -{
> - return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED;
> -}
> -
> static bool vlv_is_psr_active_on_pipe(struct drm_device *dev, int pipe)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -249,7 +244,19 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)
> EDP_PSR_ENABLE);
> }
>
> -static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
> +/**
> + * intel_psr_ready - PSR ready
> + * @intel_dp: Intel DP
> + *
> + * This function Checks if PSR is supported by Hardware/Source and
> + * Panel/Sink and if all conditions to be enabled are fulfilled.
> + *
> + * It is used to know beforehand if PSR is going to be enabled.
> + *
> + * Returns:
> + * True when PSR is ready to be enabled, false otherwise.
> + */
> +bool intel_psr_ready(struct intel_dp *intel_dp)
> {
> struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
> struct drm_device *dev = dig_port->base.base.dev;
> @@ -257,12 +264,14 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
> struct drm_crtc *crtc = dig_port->base.base.crtc;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>
> - lockdep_assert_held(&dev_priv->psr.lock);
> + if (!HAS_PSR(dev)) {
> + DRM_DEBUG_KMS("PSR not supported on this platform\n");
> + return false;
> + }
> +
> WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
> WARN_ON(!drm_modeset_is_locked(&crtc->mutex));
>
> - dev_priv->psr.source_ok = false;
> -
> if (IS_HASWELL(dev) && dig_port->port != PORT_A) {
> DRM_DEBUG_KMS("HSW ties PSR to DDI A (eDP)\n");
> return false;
> @@ -292,10 +301,19 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
> return false;
> }
>
> + /* At this point we can tell HW/Source supports PSR */
> dev_priv->psr.source_ok = true;
> +
> + /* Now check if Panel/Sink supports it */
> + if (!dev_priv->psr.sink_support) {
> + DRM_DEBUG_KMS("PSR not supported by this panel\n");
> + return false;
> + }
> +
> return true;
> }
>
> +
> static void intel_psr_activate(struct intel_dp *intel_dp)
> {
> struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> @@ -330,16 +348,11 @@ void intel_psr_enable(struct intel_dp *intel_dp)
> struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> struct drm_device *dev = intel_dig_port->base.base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_crtc *intel_crtc =
> + to_intel_crtc(intel_dig_port->base.base.crtc);
>
> - if (!HAS_PSR(dev)) {
> - DRM_DEBUG_KMS("PSR not supported on this platform\n");
> - return;
> - }
> -
> - if (!is_edp_psr(intel_dp)) {
> - DRM_DEBUG_KMS("PSR not supported by this panel\n");
> + if (!intel_crtc->config->psr_ready)
> return;
> - }
>
> mutex_lock(&dev_priv->psr.lock);
> if (dev_priv->psr.enabled) {
> @@ -347,9 +360,6 @@ void intel_psr_enable(struct intel_dp *intel_dp)
> goto unlock;
> }
>
> - if (!intel_psr_match_conditions(intel_dp))
> - goto unlock;
> -
> dev_priv->psr.busy_frontbuffer_bits = 0;
>
> if (HAS_DDI(dev)) {
--
Thanks,
--Ram
More information about the Intel-gfx
mailing list