Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drm/vc4: hdmi: Add missing clk_disable_unprepare on error path #4426

Merged

Conversation

mripard
Copy link
Contributor

@mripard mripard commented Jul 2, 2021

In vc4_hdmi_encoder_pre_crtc_configure, if clk_request_start for the HSM
clock fails, we don't call clk_disable_unprepare on the pixel clock even
though it's enabled by now.

Make sure it's there to avoid leaking that reference.

Fixes: cd4cb49 ("drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate")
Signed-off-by: Maxime Ripard [email protected]

In vc4_hdmi_encoder_pre_crtc_configure, if clk_request_start for the HSM
clock fails, we don't call clk_disable_unprepare on the pixel clock even
though it's enabled by now.

Make sure it's there to avoid leaking that reference.

Fixes: cd4cb49 ("drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate")
Signed-off-by: Maxime Ripard <[email protected]>
@pelwell pelwell merged commit 4afd064 into raspberrypi:rpi-5.10.y Jul 2, 2021
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Jul 2, 2021
…mplete

See: raspberrypi/linux#4421

kernel: Fix CPU hang when using CEC while HDMI output is disabled
See: raspberrypi/linux#4418

kernel: drm/vc4: hdmi: Add missing clk_disable_unprepare on error path
See: raspberrypi/linux#4426

kernel: staging: vc04_services: isp: Set the YUV420/YVU420 format stride to 64 bytes
See: raspberrypi/linux#4419

kernel: media: i2c: imx477: Add support for imx378 as a compatible sensor
See: raspberrypi/linux#4420
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this pull request Jul 2, 2021
…mplete

See: raspberrypi/linux#4421

kernel: Fix CPU hang when using CEC while HDMI output is disabled
See: raspberrypi/linux#4418

kernel: drm/vc4: hdmi: Add missing clk_disable_unprepare on error path
See: raspberrypi/linux#4426

kernel: staging: vc04_services: isp: Set the YUV420/YVU420 format stride to 64 bytes
See: raspberrypi/linux#4419

kernel: media: i2c: imx477: Add support for imx378 as a compatible sensor
See: raspberrypi/linux#4420
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants