lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 422/459] drm/amd/display: do not allocate display_mode_lib unnecessarily
    Date
    From: Dor Askayo <dor.askayo@gmail.com>

    [ Upstream commit bb67bfd2e7101bf2ac5327b0b7a847cd9fb9723f ]

    This allocation isn't required and can fail when resuming from suspend.

    Bug: https://gitlab.freedesktop.org/drm/amd/issues/1009
    Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
    Reviewed-by: Leo Li <sunpeng.li@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++++++--------
    1 file changed, 9 insertions(+), 8 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
    index 4b8819c27fcda..4704aac336c29 100644
    --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
    +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
    @@ -2267,12 +2267,7 @@ void dc_set_power_state(
    enum dc_acpi_cm_power_state power_state)
    {
    struct kref refcount;
    - struct display_mode_lib *dml = kzalloc(sizeof(struct display_mode_lib),
    - GFP_KERNEL);
    -
    - ASSERT(dml);
    - if (!dml)
    - return;
    + struct display_mode_lib *dml;

    switch (power_state) {
    case DC_ACPI_CM_POWER_STATE_D0:
    @@ -2294,6 +2289,12 @@ void dc_set_power_state(
    * clean state, and dc hw programming optimizations will not
    * cause any trouble.
    */
    + dml = kzalloc(sizeof(struct display_mode_lib),
    + GFP_KERNEL);
    +
    + ASSERT(dml);
    + if (!dml)
    + return;

    /* Preserve refcount */
    refcount = dc->current_state->refcount;
    @@ -2307,10 +2308,10 @@ void dc_set_power_state(
    dc->current_state->refcount = refcount;
    dc->current_state->bw_ctx.dml = *dml;

    + kfree(dml);
    +
    break;
    }
    -
    - kfree(dml);
    }

    void dc_resume(struct dc *dc)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:20    [W:6.380 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site