Skip to content

Commit cf1c87d

Browse files
committed
drm/vc4: Match drm_dev_enter and exit calls in vc4_hvs_lut_load
Commit 52efe36 ("drm/vc4: hvs: Don't write gamma luts on 2711") added a return path to vc4_hvs_lut_load that had called drm_dev_enter, but not drm_dev_exit. Ensure we call drm_dev_exit. Fixes: 52efe36 ("drm/vc4: hvs: Don't write gamma luts on 2711") Reported-by: Marek Szyprowski <[email protected]> Closes: https://lore.kernel.org/dri-devel/[email protected]/ Tested-by: Marek Szyprowski <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dave Stevenson <[email protected]>
1 parent 01c29db commit cf1c87d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static void vc4_hvs_lut_load(struct vc4_hvs *hvs,
225225
return;
226226

227227
if (hvs->vc4->gen == VC4_GEN_4)
228-
return;
228+
goto exit;
229229

230230
/* The LUT memory is laid out with each HVS channel in order,
231231
* each of which takes 256 writes for R, 256 for G, then 256
@@ -242,6 +242,7 @@ static void vc4_hvs_lut_load(struct vc4_hvs *hvs,
242242
for (i = 0; i < crtc->gamma_size; i++)
243243
HVS_WRITE(SCALER_GAMDATA, vc4_crtc->lut_b[i]);
244244

245+
exit:
245246
drm_dev_exit(idx);
246247
}
247248

0 commit comments

Comments
 (0)