[PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[vathsala nagaraju]

PSR2 is restricted to work with panel resolutions upto 3200x2000,
move the check to intel_psr_match_conditions and fully block psr.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
---
 drivers/gpu/drm/i915/intel_psr.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 6aca8ff..f2ca2a9 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 		return false;
 	}
 
+	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
+	if (intel_crtc->config->pipe_src_w > 3200 ||
+				intel_crtc->config->pipe_src_h > 2000) {
+		dev_priv->psr.psr2_support = false;
+		return false;
+	}
+
 	dev_priv->psr.source_ok = true;
 	return true;
 }
@@ -425,7 +432,6 @@ 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 = to_i915(dev);
-	struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
 
 	if (!HAS_PSR(dev_priv)) {
 		DRM_DEBUG_KMS("PSR not supported on this platform\n");
@@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
 		hsw_psr_setup_vsc(intel_dp);
 
 		if (dev_priv->psr.psr2_support) {
-			/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-			if (crtc->config->pipe_src_w > 3200 ||
-				crtc->config->pipe_src_h > 2000)
-				dev_priv->psr.psr2_support = false;
-			else
-				skl_psr_setup_su_vsc(intel_dp);
+			skl_psr_setup_su_vsc(intel_dp);
 		}
 
 		/*
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/psr: disable psr2 for resolution greater than 32X20

[Patchwork]

== Series Details ==

Series: drm/i915/psr: disable psr2 for resolution greater than 32X20
URL   : https://patchwork.freedesktop.org/series/17737/
State : success

== Summary ==

Series 17737v1 drm/i915/psr: disable psr2 for resolution greater than 32X20
https://patchwork.freedesktop.org/api/1.0/series/17737/revisions/1/mbox/

Test kms_force_connector_basic:
        Subgroup force-connector-state:
                dmesg-warn -> PASS       (fi-snb-2520m)
        Subgroup prune-stale-modes:
                skip       -> PASS       (fi-ivb-3520m)

fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-bxt-t5700     total:82   pass:69   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-ivb-3520m     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 

9ea6a075c23ea914695d57944c0e74cff0c6bff4 drm-tip: 2017y-01m-09d-16h-11m-21s UTC integration manifest
f3ad5a5 drm/i915/psr: disable psr2 for resolution greater than 32X20

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3460/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Vivi, Rodrigo]

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Tue, 2017-01-10 at 12:32 +0530, vathsala nagaraju wrote:
> PSR2 is restricted to work with panel resolutions upto 3200x2000,
> move the check to intel_psr_match_conditions and fully block psr.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jim Bride <jim.bride@linux.intel.com>
> Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_psr.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index 6aca8ff..f2ca2a9 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>  		return false;
>  	}
>  
> +	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
> +	if (intel_crtc->config->pipe_src_w > 3200 ||
> +				intel_crtc->config->pipe_src_h > 2000) {
> +		dev_priv->psr.psr2_support = false;
> +		return false;
> +	}
> +
>  	dev_priv->psr.source_ok = true;
>  	return true;
>  }
> @@ -425,7 +432,6 @@ 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 = to_i915(dev);
> -	struct intel_crtc *crtc = to_intel_crtc(intel_dig_port->base.base.crtc);
>  
>  	if (!HAS_PSR(dev_priv)) {
>  		DRM_DEBUG_KMS("PSR not supported on this platform\n");
> @@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
>  		hsw_psr_setup_vsc(intel_dp);
>  
>  		if (dev_priv->psr.psr2_support) {
> -			/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
> -			if (crtc->config->pipe_src_w > 3200 ||
> -				crtc->config->pipe_src_h > 2000)
> -				dev_priv->psr.psr2_support = false;
> -			else
> -				skl_psr_setup_su_vsc(intel_dp);
> +			skl_psr_setup_su_vsc(intel_dp);
>  		}
>  
>  		/*

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Rodrigo Vivi]

[-- Attachment #1.1: Type: text/plain, Size: 2790 bytes --]

patch merged to dinq. thanks for the patch

On Tue, Jan 10, 2017 at 12:48 PM Vivi, Rodrigo <rodrigo.vivi@intel.com>
wrote:

> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> On Tue, 2017-01-10 at 12:32 +0530, vathsala nagaraju wrote:
> > PSR2 is restricted to work with panel resolutions upto 3200x2000,
> > move the check to intel_psr_match_conditions and fully block psr.
> >
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Jim Bride <jim.bride@linux.intel.com>
> > Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_psr.c | 15 ++++++++-------
> >  1 file changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_psr.c
> b/drivers/gpu/drm/i915/intel_psr.c
> > index 6aca8ff..f2ca2a9 100644
> > --- a/drivers/gpu/drm/i915/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/intel_psr.c
> > @@ -387,6 +387,13 @@ static bool intel_psr_match_conditions(struct
> intel_dp *intel_dp)
> >               return false;
> >       }
> >
> > +     /* PSR2 is restricted to work with panel resolutions upto
> 3200x2000 */
> > +     if (intel_crtc->config->pipe_src_w > 3200 ||
> > +                             intel_crtc->config->pipe_src_h > 2000) {
> > +             dev_priv->psr.psr2_support = false;
> > +             return false;
> > +     }
> > +
> >       dev_priv->psr.source_ok = true;
> >       return true;
> >  }
> > @@ -425,7 +432,6 @@ 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 = to_i915(dev);
> > -     struct intel_crtc *crtc =
> to_intel_crtc(intel_dig_port->base.base.crtc);
> >
> >       if (!HAS_PSR(dev_priv)) {
> >               DRM_DEBUG_KMS("PSR not supported on this platform\n");
> > @@ -452,12 +458,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)
> >               hsw_psr_setup_vsc(intel_dp);
> >
> >               if (dev_priv->psr.psr2_support) {
> > -                     /* PSR2 is restricted to work with panel
> resolutions upto 3200x2000 */
> > -                     if (crtc->config->pipe_src_w > 3200 ||
> > -                             crtc->config->pipe_src_h > 2000)
> > -                             dev_priv->psr.psr2_support = false;
> > -                     else
> > -                             skl_psr_setup_su_vsc(intel_dp);
> > +                     skl_psr_setup_su_vsc(intel_dp);
> >               }
> >
> >               /*
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>

[-- Attachment #1.2: Type: text/html, Size: 5324 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Rodrigo Vivi]

Patch merged to dinq, thanks.

I didn't put on fixes nor Cc'ed stable after chatting with Daniel about that.
Since PSR is currently disabled on 4.11 there is no risk of this
blowing anything nor changing the expected default behaviour.
So dinq seemed to be the right place for this patch.

Thanks,
Rodrigo.

On Mon, May 29, 2017 at 1:24 AM, Jani Nikula
<jani.nikula@linux.intel.com> wrote:
> On Fri, 26 May 2017, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
>> I believe we need to cc:stable on this right?!
>>
>> Jani, is this ok to go ahead and merge after stable is cc'ed?
>
> Please add this, and it'll all happen automagically.
>
> Fixes: acf45d11050a ("drm/i915/psr: disable psr2 for resolution greater than 32X20")
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jim Bride <jim.bride@linux.intel.com>
> Cc: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: <stable@vger.kernel.org> # v4.11+
>
> BR,
> Jani.
>
>
>>
>> On Thu, May 25, 2017 at 9:43 AM, vathsala nagaraju
>> <vathsala.nagaraju@intel.com> wrote:
>>> psr1 is also disabled for panel resolution  greater than 32X20.
>>> Added psr2 check to disable only for psr2 panels having resolution
>>> greater than 32X20.
>>>
>>> issue was introduced by
>>> commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba"
>>> commit message: "PSR2 is restricted to work with panel resolutions
>>> upto 3200x2000, move the check to intel_psr_match_conditions and fully
>>> block psr."
>>>
>>> v2: (Rodrigo)
>>>    Add previous commit details which introduced the issue
>>>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: Jim Bride <jim.bride@linux.intel.com>
>>> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
>>> Reported-by: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
>>> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
>>> ---
>>>  drivers/gpu/drm/i915/intel_psr.c | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
>>> index c3780d0..559f1ab 100644
>>> --- a/drivers/gpu/drm/i915/intel_psr.c
>>> +++ b/drivers/gpu/drm/i915/intel_psr.c
>>> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>>>         }
>>>
>>>         /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
>>> -       if (intel_crtc->config->pipe_src_w > 3200 ||
>>> -                               intel_crtc->config->pipe_src_h > 2000) {
>>> +       if (dev_priv->psr.psr2_support &&
>>> +           (intel_crtc->config->pipe_src_w > 3200 ||
>>> +            intel_crtc->config->pipe_src_h > 2000)) {
>>>                 dev_priv->psr.psr2_support = false;
>>>                 return false;
>>>         }
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Jani Nikula]

On Fri, 26 May 2017, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> I believe we need to cc:stable on this right?!
>
> Jani, is this ok to go ahead and merge after stable is cc'ed?

Please add this, and it'll all happen automagically.

Fixes: acf45d11050a ("drm/i915/psr: disable psr2 for resolution greater than 32X20")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.11+

BR,
Jani.


>
> On Thu, May 25, 2017 at 9:43 AM, vathsala nagaraju
> <vathsala.nagaraju@intel.com> wrote:
>> psr1 is also disabled for panel resolution  greater than 32X20.
>> Added psr2 check to disable only for psr2 panels having resolution
>> greater than 32X20.
>>
>> issue was introduced by
>> commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba"
>> commit message: "PSR2 is restricted to work with panel resolutions
>> upto 3200x2000, move the check to intel_psr_match_conditions and fully
>> block psr."
>>
>> v2: (Rodrigo)
>>    Add previous commit details which introduced the issue
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Jim Bride <jim.bride@linux.intel.com>
>> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
>> Reported-by: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
>> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_psr.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
>> index c3780d0..559f1ab 100644
>> --- a/drivers/gpu/drm/i915/intel_psr.c
>> +++ b/drivers/gpu/drm/i915/intel_psr.c
>> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>>         }
>>
>>         /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
>> -       if (intel_crtc->config->pipe_src_w > 3200 ||
>> -                               intel_crtc->config->pipe_src_h > 2000) {
>> +       if (dev_priv->psr.psr2_support &&
>> +           (intel_crtc->config->pipe_src_w > 3200 ||
>> +            intel_crtc->config->pipe_src_h > 2000)) {
>>                 dev_priv->psr.psr2_support = false;
>>                 return false;
>>         }
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Rodrigo Vivi]

I believe we need to cc:stable on this right?!

Jani, is this ok to go ahead and merge after stable is cc'ed?

On Thu, May 25, 2017 at 9:43 AM, vathsala nagaraju
<vathsala.nagaraju@intel.com> wrote:
> psr1 is also disabled for panel resolution  greater than 32X20.
> Added psr2 check to disable only for psr2 panels having resolution
> greater than 32X20.
>
> issue was introduced by
> commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba"
> commit message: "PSR2 is restricted to work with panel resolutions
> upto 3200x2000, move the check to intel_psr_match_conditions and fully
> block psr."
>
> v2: (Rodrigo)
>    Add previous commit details which introduced the issue
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jim Bride <jim.bride@linux.intel.com>
> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
> Reported-by: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_psr.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index c3780d0..559f1ab 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>         }
>
>         /* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
> -       if (intel_crtc->config->pipe_src_w > 3200 ||
> -                               intel_crtc->config->pipe_src_h > 2000) {
> +       if (dev_priv->psr.psr2_support &&
> +           (intel_crtc->config->pipe_src_w > 3200 ||
> +            intel_crtc->config->pipe_src_h > 2000)) {
>                 dev_priv->psr.psr2_support = false;
>                 return false;
>         }
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[vathsala nagaraju]

psr1 is also disabled for panel resolution  greater than 32X20.
Added psr2 check to disable only for psr2 panels having resolution
greater than 32X20.

issue was introduced by
commit-id : "acf45d11050abd751dcec986ab121cb2367dcbba"
commit message: "PSR2 is restricted to work with panel resolutions
upto 3200x2000, move the check to intel_psr_match_conditions and fully
block psr."

v2: (Rodrigo)
   Add previous commit details which introduced the issue

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
Reported-by: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index c3780d0..559f1ab 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Jani Nikula]

On Tue, 23 May 2017, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote:
> A bit of history on the commit message pointing the commit that
> introduced the issue is desired.

s/desired/absolutely required/.

BR,
Jani.


>
> With that in place feel free to use:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> On Tue, 2017-05-23 at 22:27 +0530, vathsala nagaraju wrote:
>> psr1 is also disabled for panel resolution  greater than 32X20.
>> Added psr2 check to disable only for psr2 panels having resolution
>> greater than 32X20.
>> 
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Jim Bride <jim.bride@linux.intel.com>
>> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
>> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_psr.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
>> index c3780d0..559f1ab 100644
>> --- a/drivers/gpu/drm/i915/intel_psr.c
>> +++ b/drivers/gpu/drm/i915/intel_psr.c
>> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>>  	}
>>  
>>  	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
>> -	if (intel_crtc->config->pipe_src_w > 3200 ||
>> -				intel_crtc->config->pipe_src_h > 2000) {
>> +	if (dev_priv->psr.psr2_support &&
>> +	    (intel_crtc->config->pipe_src_w > 3200 ||
>> +	     intel_crtc->config->pipe_src_h > 2000)) {
>>  		dev_priv->psr.psr2_support = false;
>>  		return false;
>>  	}
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Vivi, Rodrigo]

A bit of history on the commit message pointing the commit that
introduced the issue is desired.

With that in place feel free to use:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Tue, 2017-05-23 at 22:27 +0530, vathsala nagaraju wrote:
> psr1 is also disabled for panel resolution  greater than 32X20.
> Added psr2 check to disable only for psr2 panels having resolution
> greater than 32X20.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jim Bride <jim.bride@linux.intel.com>
> Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
> Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_psr.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index c3780d0..559f1ab 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
>  	}
>  
>  	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
> -	if (intel_crtc->config->pipe_src_w > 3200 ||
> -				intel_crtc->config->pipe_src_h > 2000) {
> +	if (dev_priv->psr.psr2_support &&
> +	    (intel_crtc->config->pipe_src_w > 3200 ||
> +	     intel_crtc->config->pipe_src_h > 2000)) {
>  		dev_priv->psr.psr2_support = false;
>  		return false;
>  	}

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[vathsala nagaraju]

psr1 is also disabled for panel resolution  greater than 32X20.
Added psr2 check to disable only for psr2 panels having resolution
greater than 32X20.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Yaroslav Shabalin <yaroslav.shabalin@gmail.com>
Signed-off-by: vathsala nagaraju <vathsala.nagaraju@intel.com>
---
 drivers/gpu/drm/i915/intel_psr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index c3780d0..559f1ab 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -435,8 +435,9 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)
 	}
 
 	/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
-	if (intel_crtc->config->pipe_src_w > 3200 ||
-				intel_crtc->config->pipe_src_h > 2000) {
+	if (dev_priv->psr.psr2_support &&
+	    (intel_crtc->config->pipe_src_w > 3200 ||
+	     intel_crtc->config->pipe_src_h > 2000)) {
 		dev_priv->psr.psr2_support = false;
 		return false;
 	}
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Nagaraju, Vathsala]

[-- Attachment #1.1: Type: text/plain, Size: 1737 bytes --]

Hi Yaroslav Shabalin,

This  restriction is only for PSR2.  Will provide the fix.

Regards,
Vathsala
From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Yaroslav Shabalin
Sent: Tuesday, May 23, 2017 4:59 AM
To: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

Hi!

I'm not sure if this is suitable way to report bugs but seems that this change breaks PSR support on my laptop.
I have Dell XPS 15 9550 with Skylake i7-6700HQ CPU, 4K screen resolution (3840x2160) and Arch Linux installed. Having i915.enable_psr=1 boot parameter on kernels <= 4.10 I get the following:

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: yes
Enabled: yes
Active: yes
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: yes

However on kernel 4.11 (which I believe has this commit merged) PSR is not enabled with native screen resolution.

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: no
Enabled: no
Active: no
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: no

If I change resolution to lower value (i.e. 3200x1800) PSR gets enabled as on <= 4.10 kernel.

That is very sad because without PSR CPU never goes deeper than PC7 increasing idle power consumption by ~1W. I would really appreciate if someone investigate this issue. Is this resolution restriction really needed and should block PSR fully? Seems that on older kernels it wasn't a problem. Please let me know if you need any additional diagnostic information.

[-- Attachment #1.2: Type: text/html, Size: 6200 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Nagaraju, Vathsala]

[-- Attachment #1.1: Type: text/plain, Size: 1792 bytes --]

Hi Shablin,

I will look In to it and provide the fix.

Regards,
Vathsala

From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Yaroslav Shabalin
Sent: Tuesday, May 23, 2017 2:45 PM
To: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

Hi!

I'm not sure if this is suitable way to report bugs but seems that this change (https://github.com/torvalds/linux/commit/acf45d11050abd751dcec986ab121cb2367dcbba) breaks PSR support on my laptop.
I have Dell XPS 15 9550 with Skylake i7-6700HQ CPU, 4K screen resolution (3840x2160) and Arch Linux installed. Adding i915.enable_psr=1 boot parameter on kernels <= 4.10 I get the following:

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: yes
Enabled: yes
Active: yes
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: yes

However on kernel 4.11 (which I believe has this commit merged) PSR is not enabled with native screen resolution.

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: no
Enabled: no
Active: no
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: no

If I change resolution to lower value (i.e. 3200x1800) PSR gets enabled as on <= 4.10 kernel.

That is very sad because without PSR CPU never goes deeper than PC7 adding ~1W to idle power consumption. I would really appreciate if someone investigate this issue. Is this resolution restriction really needed and should block PSR fully? Seems that on older kernels it wasn't a problem. Please let me know if you need any additional diagnostic information.

[-- Attachment #1.2: Type: text/html, Size: 6370 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Yaroslav Shabalin]

[-- Attachment #1.1: Type: text/plain, Size: 1413 bytes --]

Hi!

I'm not sure if this is suitable way to report bugs but seems that this
change (
https://github.com/torvalds/linux/commit/acf45d11050abd751dcec986ab121cb2367dcbba)
breaks PSR support on my laptop.
I have Dell XPS 15 9550 with Skylake i7-6700HQ CPU, 4K screen resolution
(3840x2160) and Arch Linux installed. Adding i915.enable_psr=1 boot
parameter on kernels <= 4.10 I get the following:

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: yes
Enabled: yes
Active: yes
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: yes

However on kernel 4.11 (which I believe has this commit merged) PSR is not
enabled with native screen resolution.

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: no
Enabled: no
Active: no
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: no

If I change resolution to lower value (i.e. 3200x1800) PSR gets enabled as
on <= 4.10 kernel.

That is very sad because without PSR CPU never goes deeper than PC7 adding
~1W to idle power consumption. I would really appreciate if someone
investigate this issue. Is this resolution restriction really needed and
should block PSR fully? Seems that on older kernels it wasn't a problem.
Please let me know if you need any additional diagnostic information.

[-- Attachment #1.2: Type: text/html, Size: 1900 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: disable psr2 for resolution greater than 32X20

[Yaroslav Shabalin]

[-- Attachment #1.1: Type: text/plain, Size: 1332 bytes --]

Hi!

I'm not sure if this is suitable way to report bugs but seems that this
change breaks PSR support on my laptop.
I have Dell XPS 15 9550 with Skylake i7-6700HQ CPU, 4K screen resolution
(3840x2160) and Arch Linux installed. Having i915.enable_psr=1 boot
parameter on kernels <= 4.10 I get the following:

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: yes
Enabled: yes
Active: yes
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: yes

However on kernel 4.11 (which I believe has this commit merged) PSR is not
enabled with native screen resolution.

-> cat /sys/kernel/debug/dri/0/i915_edp_psr_status
Sink_Support: yes
Source_OK: no
Enabled: no
Active: no
Busy frontbuffer bits: 0x000
Re-enable work scheduled: no
Main link in standby mode: no
HW Enabled & Active bit: no

If I change resolution to lower value (i.e. 3200x1800) PSR gets enabled as
on <= 4.10 kernel.

That is very sad because without PSR CPU never goes deeper than PC7
increasing idle power consumption by ~1W. I would really appreciate if
someone investigate this issue. Is this resolution restriction really
needed and should block PSR fully? Seems that on older kernels it wasn't a
problem. Please let me know if you need any additional diagnostic
information.

[-- Attachment #1.2: Type: text/html, Size: 1713 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx