drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
commit5.4-rM2-2.2.x-imx-squasheda39d0d7bdf
upstream. 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 <jdelvare@suse.de> Fixes:e008fa6fb4
("drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config") Cc: stable@vger.kernel.org Cc: Navid Emamdoost <navid.emamdoost@gmail.com> Cc: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
de21eb7f8c
commit
3d54a640e2
|
@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,
|
||||||
take the current one */
|
take the current one */
|
||||||
if (active && !adev->have_disp_power_ref) {
|
if (active && !adev->have_disp_power_ref) {
|
||||||
adev->have_disp_power_ref = true;
|
adev->have_disp_power_ref = true;
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
/* if we have no active crtcs, then drop the power ref
|
/* if we have no active crtcs, then drop the power ref
|
||||||
we got before */
|
we got before */
|
||||||
|
|
Loading…
Reference in New Issue