drm/i915/psr: disable psr2 for resolution greater than 32X20
diff mbox

Message ID 49935bdff896ee3140bed471012b9f9110a863a4.1495729964.git.vathsala.nagaraju@intel.com
State New
Headers show

Commit Message

vathsala nagaraju May 25, 2017, 4:43 p.m. UTC
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(-)

Comments

Rodrigo Vivi May 26, 2017, 7:10 p.m. UTC | #1
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
Jani Nikula May 29, 2017, 8:24 a.m. UTC | #2
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
Rodrigo Vivi May 30, 2017, 5:45 p.m. UTC | #3
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

Patch
diff mbox

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;
 	}