On Mon, Mar 30, 2015 at 03:19:29PM +0530, Ramalingam C wrote: > Looks good to me.. > > Reviewed-by: Ramalingam C <ramalingam.c@xxxxxxxxx> > > On Friday 27 March 2015 12:51 AM, Rodrigo Vivi wrote: > >With PSR enabled being pre computed on pipe_config we can now > >prevent DRRS to be enabled along with PSR. > > > >v2: Rebase after changing previous patch > > > >Cc: Ramalingam C <ramalingam.c@xxxxxxxxx> > >Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Both patches applied, thanks. -Daniel > >--- > > drivers/gpu/drm/i915/intel_dp.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > >index e6b1c42..5551b3c 100644 > >--- a/drivers/gpu/drm/i915/intel_dp.c > >+++ b/drivers/gpu/drm/i915/intel_dp.c > >@@ -4994,11 +4994,6 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) > > return; > > } > >- /* > >- * FIXME: This needs proper synchronization with psr state for some > >- * platforms that cannot have PSR and DRRS enabled at the same time. > >- */ > >- > > dig_port = dp_to_dig_port(intel_dp); > > encoder = &dig_port->base; > > intel_crtc = encoder->new_crtc; > >@@ -5084,6 +5079,11 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp) > > return; > > } > >+ if (intel_crtc->config->psr_ready) { > >+ DRM_DEBUG_KMS("DRRS: PSR will be enabled on this crtc\n"); > >+ return; > >+ } > >+ > > mutex_lock(&dev_priv->drrs.mutex); > > if (WARN_ON(dev_priv->drrs.dp)) { > > DRM_ERROR("DRRS already enabled\n"); > > -- > Thanks, > --Ram > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx