NACK[J]/Cmnt: [PATCH V3][SRU][J/OEM-5.17] drm/amd/display: No display after resume from WB/CB

[Stefan Bader]

On 03.01.23 15:25, Koba Ko wrote:
> From: Tsung-hua Lin <Tsung-hua.Lin at amd.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1999836
> 
> [why]
> First MST sideband message returns AUX_RET_ERROR_HPD_DISCON
> on certain intel platform. Aux transaction considered failure
> if HPD unexpected pulled low. The actual aux transaction success
> in such case, hence do not return error.
> 
> [how]
> Not returning error when AUX_RET_ERROR_HPD_DISCON detected
> on the first sideband message.
> 
> v2: squash in fix (Alex)
> 
> Reviewed-by: Jerry Zuo <Jerry.Zuo at amd.com>
> Acked-by: Brian Chang <Brian.Chang at amd.com>
> Signed-off-by: Tsung-hua Lin <Tsung-hua.Lin at amd.com>
> Tested-by: Daniel Wheeler <daniel.wheeler at amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> (cherry picked from commit 503dc81c32b7138b55133ea2146a6b850155098d)
> Signed-off-by: Koba Ko <koba.ko at canonical.com>
> ~~~
> V3: clean cherry-pick for J/OEM-5.17
> ---

Not sure how people managed to do this but this commit seems to appear in the 
upstream log history twice:

503dc81c32b7 drm/amd/display: No display after resume from WB/CB
a6e1775da04a drm/amd/display: No display after resume from WB/CB

It is now already applied via stable referring to the a6... SHA1. Also there was 
a v2 which first was NACKed and then ACKed again which makes this even more 
confusing.

-Stefan

>   .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 +++++++++++++++++++
>   1 file changed, 36 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 023ab596c6ba7..b7875c6c28c8f 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1299,6 +1299,42 @@ static const struct dmi_system_id hpd_disconnect_quirk_table[] = {
>   			DMI_MATCH(DMI_PRODUCT_NAME, "Precision 3460"),
>   		},
>   	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Tower Plus 7010"),
> +		},
> +	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Tower 7010"),
> +		},
> +	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex SFF Plus 7010"),
> +		},
> +	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex SFF 7010"),
> +		},
> +	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Micro Plus 7010"),
> +		},
> +	},
> +	{
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Micro 7010"),
> +		},
> +	},
>   	{}
>   };
>   

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20230130/a73f84b8/attachment-0001.sig>