UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: do not allocate display_mode_lib unnecessarily 

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>
This commit is contained in:
Dor Askayo 2020-01-04 14:22:15 +02:00 committed by Alex Deucher
parent 77171eade8
commit bb67bfd2e7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -2462,12 +2462,7 @@ void dc_set_power_state(
enum dc_acpi_cm_power_state power_state) enum dc_acpi_cm_power_state power_state)
{ {
struct kref refcount; struct kref refcount;
struct display_mode_lib *dml = kzalloc(sizeof(struct display_mode_lib), struct display_mode_lib *dml;
GFP_KERNEL);
ASSERT(dml);
if (!dml)
return;
switch (power_state) { switch (power_state) {
case DC_ACPI_CM_POWER_STATE_D0: case DC_ACPI_CM_POWER_STATE_D0:
@ -2490,6 +2485,12 @@ void dc_set_power_state(
* clean state, and dc hw programming optimizations will not * clean state, and dc hw programming optimizations will not
* cause any trouble. * cause any trouble.
*/ */
dml = kzalloc(sizeof(struct display_mode_lib),
GFP_KERNEL);
ASSERT(dml);
if (!dml)
return;
/* Preserve refcount */ /* Preserve refcount */
refcount = dc->current_state->refcount; refcount = dc->current_state->refcount;
@ -2503,10 +2504,10 @@ void dc_set_power_state(
dc->current_state->refcount = refcount; dc->current_state->refcount = refcount;
dc->current_state->bw_ctx.dml = *dml; dc->current_state->bw_ctx.dml = *dml;
kfree(dml);
break; break;
} }
kfree(dml);
} }
void dc_resume(struct dc *dc) void dc_resume(struct dc *dc)