2020-07-08 08:27:29

by Aaron Ma

[permalink] [raw]
Subject: [PATCH] drm/amd/display: add dmcub check on RENOIR

RENOIR loads dmub fw not dmcu, check dmcu only will prevent loading iram,
it breaks backlight control.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208277
Signed-off-by: Aaron Ma <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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 10ac8076d4f2..db5e0bb0d935 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1358,7 +1358,7 @@ static int dm_late_init(void *handle)
struct dmcu *dmcu = NULL;
bool ret;

- if (!adev->dm.fw_dmcu)
+ if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
return detect_mst_link_for_all_connectors(adev->ddev);

dmcu = adev->dm.dc->res_pool->dmcu;
--
2.25.1


2020-07-08 14:33:14

by Kazlauskas, Nicholas

[permalink] [raw]
Subject: Re: [PATCH] drm/amd/display: add dmcub check on RENOIR

Looks good to me.

Reviewed-by: Nicholas Kazlauskas <[email protected]>

Regards,
Nicholas Kazlauskas

On 2020-07-08 10:15 a.m., Deucher, Alexander wrote:
> [AMD Public Use]
>
>
> [AMD Public Use]
>
>
> Acked-by: Alex Deucher <[email protected]>
> ------------------------------------------------------------------------
> *From:* Aaron Ma <[email protected]>
> *Sent:* Wednesday, July 8, 2020 4:16 AM
> *To:* Wentland, Harry <[email protected]>; Li, Sun peng (Leo)
> <[email protected]>; Deucher, Alexander <[email protected]>;
> Koenig, Christian <[email protected]>; [email protected]
> <[email protected]>; [email protected] <[email protected]>;
> [email protected] <[email protected]>;
> [email protected] <[email protected]>;
> [email protected] <[email protected]>;
> [email protected] <[email protected]>; [email protected]
> <[email protected]>
> *Subject:* [PATCH] drm/amd/display: add dmcub check on RENOIR
> RENOIR loads dmub fw not dmcu, check dmcu only will prevent loading iram,
> it breaks backlight control.
>
> Bug:
> https://bugzilla.kernel.org/show_bug.cgi?id=208277
> <https://bugzilla.kernel.org/show_bug.cgi?id=208277>
> Signed-off-by: Aaron Ma <[email protected]>
> ---
> ?drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
> ?1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 10ac8076d4f2..db5e0bb0d935 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1358,7 +1358,7 @@ static int dm_late_init(void *handle)
> ???????? struct dmcu *dmcu = NULL;
> ???????? bool ret;
>
> -?????? if (!adev->dm.fw_dmcu)
> +?????? if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
> ???????????????? return detect_mst_link_for_all_connectors(adev->ddev);
>
> ???????? dmcu = adev->dm.dc->res_pool->dmcu;
> --
> 2.25.1
>
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>