diff options
| author | Jean Delvare <[email protected]> | 2020-09-28 09:10:37 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2020-09-29 20:11:45 +0000 |
| commit | 3514521ccbd25ef3bd47b3c2abc28befbea8cdb1 (patch) | |
| tree | 5d9b01b02f75071c9349d6268a4e09e37cc88cb0 /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | drm/amd/display: make two symbols static (diff) | |
| download | kernel-3514521ccbd25ef3bd47b3c2abc28befbea8cdb1.tar.gz kernel-3514521ccbd25ef3bd47b3c2abc28befbea8cdb1.zip | |
drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
A recent attempt to fix a ref count leak in
amdgpu_display_crtc_set_config() turned out to be doing too much and
"fixed" an intended decrease as if it were a leak. Undo that part to
restore the proper balance. This is the very nature of this function
to increase or decrease the power reference count depending on the
situation.
Consequences of this bug is that the power reference would
eventually get down to 0 while the display was still in use,
resulting in that display switching off unexpectedly.
Signed-off-by: Jean Delvare <[email protected]>
Fixes: e008fa6fb415 ("drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config")
Cc: [email protected]
Cc: Navid Emamdoost <[email protected]>
Cc: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index c81206e6096f..7cc7af2a6822 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, take the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; - goto out; + return ret; } /* if we have no active crtcs, then drop the power ref we got before */ |