lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 256/663] drm/amdgpu/display: remove hdcp_srm sysfs on device removal
    Date
    From: Nirmoy Das <nirmoy.das@amd.com>

    [ Upstream commit e96b1b2974989c6a25507b527843ede7594efc85 ]

    Fixes: 9037246bb2da5 ("drm/amd/display: Add sysfs interface for set/get srm")

    Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 3 ++-
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 2 +-
    3 files changed, 4 insertions(+), 3 deletions(-)

    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 fdca76fc598c0..bffaefaf5a292 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    @@ -1096,7 +1096,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)

    #ifdef CONFIG_DRM_AMD_DC_HDCP
    if (adev->dm.hdcp_workqueue) {
    - hdcp_destroy(adev->dm.hdcp_workqueue);
    + hdcp_destroy(&adev->dev->kobj, adev->dm.hdcp_workqueue);
    adev->dm.hdcp_workqueue = NULL;
    }

    diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    index c2cd184f0bbd4..79de68ac03f20 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
    @@ -376,7 +376,7 @@ static void event_cpirq(struct work_struct *work)
    }


    -void hdcp_destroy(struct hdcp_workqueue *hdcp_work)
    +void hdcp_destroy(struct kobject *kobj, struct hdcp_workqueue *hdcp_work)
    {
    int i = 0;

    @@ -385,6 +385,7 @@ void hdcp_destroy(struct hdcp_workqueue *hdcp_work)
    cancel_delayed_work_sync(&hdcp_work[i].watchdog_timer_dwork);
    }

    + sysfs_remove_bin_file(kobj, &hdcp_work[0].attr);
    kfree(hdcp_work->srm);
    kfree(hdcp_work->srm_temp);
    kfree(hdcp_work);
    diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h
    index 5159b3a5e5b03..09294ff122fea 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h
    @@ -69,7 +69,7 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work,

    void hdcp_reset_display(struct hdcp_workqueue *work, unsigned int link_index);
    void hdcp_handle_cpirq(struct hdcp_workqueue *work, unsigned int link_index);
    -void hdcp_destroy(struct hdcp_workqueue *work);
    +void hdcp_destroy(struct kobject *kobj, struct hdcp_workqueue *work);

    struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev, struct cp_psp *cp_psp, struct dc *dc);

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 01:11    [W:4.021 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site