Message ID | 1430972908-29443-1-git-send-email-sonika.jindal@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
>-----Original Message----- >From: Jindal, Sonika >Sent: Thursday, May 7, 2015 9:58 AM >To: intel-gfx@lists.freedesktop.org >Cc: Jindal, Sonika; R, Durgadoss >Subject: [PATCH] Removing redundant is_edp_psr > >Since we already store the sink's psr status in dev_priv, use it. >Without this we were ignoring the case where sink supports psr2. Looks like it is already updated in this patch from Rodrigo: drm/i915: Add psr_ready on pipe_config [https://tango.freedesktop.org/patch/45695/] Thanks, Durga > >Cc: Durgadoss R <durgadoss.r@intel.com> >Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> >--- > drivers/gpu/drm/i915/intel_psr.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > >diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c >index 27608ce..406d3ac 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; >@@ -365,7 +360,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) > return; > } > >- if (!is_edp_psr(intel_dp)) { >+ if (!dev_priv->psr.sink_support) { > DRM_DEBUG_KMS("PSR not supported by this panel\n"); > return; > } >-- >1.7.10.4
Oh great then :) Thanks, Sonika -----Original Message----- From: R, Durgadoss Sent: Thursday, May 7, 2015 11:19 AM To: Jindal, Sonika; intel-gfx@lists.freedesktop.org Subject: RE: [PATCH] Removing redundant is_edp_psr >-----Original Message----- >From: Jindal, Sonika >Sent: Thursday, May 7, 2015 9:58 AM >To: intel-gfx@lists.freedesktop.org >Cc: Jindal, Sonika; R, Durgadoss >Subject: [PATCH] Removing redundant is_edp_psr > >Since we already store the sink's psr status in dev_priv, use it. >Without this we were ignoring the case where sink supports psr2. Looks like it is already updated in this patch from Rodrigo: drm/i915: Add psr_ready on pipe_config [https://tango.freedesktop.org/patch/45695/] Thanks, Durga > >Cc: Durgadoss R <durgadoss.r@intel.com> >Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> >--- > drivers/gpu/drm/i915/intel_psr.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > >diff --git a/drivers/gpu/drm/i915/intel_psr.c >b/drivers/gpu/drm/i915/intel_psr.c >index 27608ce..406d3ac 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; @@ -365,7 >+360,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) > return; > } > >- if (!is_edp_psr(intel_dp)) { >+ if (!dev_priv->psr.sink_support) { > DRM_DEBUG_KMS("PSR not supported by this panel\n"); > return; > } >-- >1.7.10.4
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6339
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276
ILK -1 302/302 301/302
SNB 316/316 316/316
IVB 342/342 342/342
BYT 286/286 286/286
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_pipe_crc_basic@bad-source PASS(3) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:drm_edid_block_valid[drm]]*ERROR*EDID_checksum_is_invalid,remainder_is@EDID checksum is .* remainder is
Note: You need to pay more attention to line start with '*'
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 27608ce..406d3ac 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; @@ -365,7 +360,7 @@ void intel_psr_enable(struct intel_dp *intel_dp) return; } - if (!is_edp_psr(intel_dp)) { + if (!dev_priv->psr.sink_support) { DRM_DEBUG_KMS("PSR not supported by this panel\n"); return; }
Since we already store the sink's psr status in dev_priv, use it. Without this we were ignoring the case where sink supports psr2. Cc: Durgadoss R <durgadoss.r@intel.com> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> --- drivers/gpu/drm/i915/intel_psr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)