[SRU][H/Unstable][PATCH 2/2] UBUNTU: SAUCE: drm/i915/display/psr: Disable DC3CO when the PSR2 is used

[Hui Wang]

On 5/12/21 6:07 PM, Kleber Souza wrote:
> On 06.05.21 05:48, Hui Wang wrote:
>> From: Gwan-gyeong Mun <gwan-gyeong.mun at intel.com>
>>
>> BugLink: https://bugs.launchpad.net/bugs/1922885
>>
>> Due to the changed sequence of activating/deactivating DC3CO, disable
>> DC3CO until the changed dc3co activating/deactivating sequence is 
>> applied.
>>
>> References: https://gitlab.freedesktop.org/drm/intel/-/issues/3134
>> Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun at intel.com>
>> Reviewed-by: José Roberto de Souza <jose.souza at intel.com>
>> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
>> Link: 
>> https://patchwork.freedesktop.org/patch/msgid/20210401170237.40472-1-gwan-gyeong.mun@intel.com
>> (cherry picked from commit 2d667442dbe70e7e78c3450b17ba5aa5032a7b6b
>> git://anongit.freedesktop.org/drm-tip drm-tip)
>
> This patch has been applied to linux-next now with the same sha1. We can
> fix the line above when applying.
>
OK, got it. thanks.


> Thanks,
> Kleber
>
>> Signed-off-by: Hui Wang <hui.wang at canonical.com>
>> ---
>>   drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c 
>> b/drivers/gpu/drm/i915/display/intel_psr.c
>> index f6a5751276ba..7c7b971c791f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_psr.c
>> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
>> @@ -654,6 +654,13 @@ tgl_dc3co_exitline_compute_config(struct 
>> intel_dp *intel_dp,
>>       struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>>       u32 exit_scanlines;
>>   +    /*
>> +     * FIXME: Due to the changed sequence of activating/deactivating 
>> DC3CO,
>> +     * disable DC3CO until the changed dc3co activating/deactivating 
>> sequence
>> +     * is applied. B.Specs:49196
>> +     */
>> +    return;
>> +
>>       /*
>>        * DMC's DC3CO exit mechanism has an issue with Selective Fecth
>>        * TODO: when the issue is addressed, this restriction should 
>> be removed.
>>
>