Commit 42aa18d1 authored by Dave Stevenson's avatar Dave Stevenson
Browse files

drm/vc4: Correct generation check in vc4_hvs_lut_load 



Commit 24c5ed3d ("drm/vc4: Introduce generation number enum")
incorrectly swapped a check of hvs->vc4->is_vc5 to
hvs->vc4->gen == VC4_GEN_4 in vc4_hvs_lut_load, hence breaking
loading the gamma look up table on Pi0-3.

Correct that conditional.

Fixes: 24c5ed3d ("drm/vc4: Introduce generation number enum")
Reported-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Closes: https://lore.kernel.org/dri-devel/37051126-3921-4afe-a936-5f828bff5752@samsung.com/


Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarMaíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241008-drm-vc4-fixes-v1-3-9d0396ca9f42@raspberrypi.com


Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
parent 6b0bd1b0

drivers/gpu/drm/vc4/vc4_hvs.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void vc4_hvs_lut_load(struct vc4_hvs *hvs, 
	if (!drm_dev_enter(drm, &idx))

		return;



	if (hvs->vc4->gen == VC4_GEN_4)

	if (hvs->vc4->gen != VC4_GEN_4)

		goto exit;



	/* The LUT memory is laid out with each HVS channel in order,