[PATCH 02/02] drm/amd/display: add cyan_skillfish display support

[Alex Deucher]

On Mon, Sep 27, 2021 at 4:43 PM Liu, Zhan <Zhan.Liu at amd.com> wrote:
>
> [Public]
>
> [Why]
> add display related cyan_skillfish files in.
>
> makefile controlled by CONFIG_DRM_AMD_DC_DCN201 flag.
>
> Signed-off-by: Charlene Liu <charlene.liu at amd.com>
> Signed-off-by: Zhan Liu <zhan.liu at amd.com>
> Reviewed-by: Charlene Liu <charlene.liu at amd.com>
> Acked-by: Jun Lei <jun.lei at amd.com>
> ---
<snip>

> @@ -1457,34 +1460,33 @@
>  #if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
>         adev->dm.crc_rd_wrk = amdgpu_dm_crtc_secure_display_create_work();
>  #endif
> -       if (dc_enable_dmub_notifications(adev->dm.dc)) {
> -               init_completion(&adev->dm.dmub_aux_transfer_done);
> -               adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
> -               if (!adev->dm.dmub_notify) {
> -                       DRM_INFO("amdgpu: fail to allocate adev->dm.dmub_notify");
> -                       goto error;
> -               }
>
> -               adev->dm.delayed_hpd_wq = create_singlethread_workqueue("amdgpu_dm_hpd_wq");
> -               if (!adev->dm.delayed_hpd_wq) {
> -                       DRM_ERROR("amdgpu: failed to create hpd offload workqueue.\n");
> -                       goto error;
> -               }
> -
> -               amdgpu_dm_outbox_init(adev);
> -#if defined(CONFIG_DRM_AMD_DC_DCN)
> -               if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_AUX_REPLY,
> -                       dmub_aux_setconfig_callback, false)) {
> -                       DRM_ERROR("amdgpu: fail to register dmub aux callback");
> -                       goto error;
> -               }
> -               if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD, dmub_hpd_callback, true)) {
> -                       DRM_ERROR("amdgpu: fail to register dmub hpd callback");
> -                       goto error;
> -               }
> -#endif
> +       init_completion(&adev->dm.dmub_aux_transfer_done);
> +       adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
> +       if (!adev->dm.dmub_notify) {
> +               DRM_INFO("amdgpu: fail to allocate adev->dm.dmub_notify");
> +               goto error;
>         }
>
> +       adev->dm.delayed_hpd_wq = create_singlethread_workqueue("amdgpu_dm_hpd_wq");
> +       if (!adev->dm.delayed_hpd_wq) {
> +               DRM_ERROR("amdgpu: failed to create hpd offload workqueue.\n");
> +               goto error;
> +       }
> +
> +       amdgpu_dm_outbox_init(adev);
> +#if defined(CONFIG_DRM_AMD_DC_DCN)
> +       if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_AUX_REPLY,
> +               dmub_aux_setconfig_callback, false)) {
> +               DRM_ERROR("amdgpu: fail to register dmub aux callback");
> +               goto error;
> +       }
> +       if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD, dmub_hpd_callback, true)) {
> +               DRM_ERROR("amdgpu: fail to register dmub hpd callback");
> +               goto error;
> +       }
> +#endif
> +

This change above looks unrelated.  Please double check this is correct.

Alex