tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/etnaviv: fix tx clock gating on some GC7000 variants

commit 4bce244272513 ("drm/etnaviv: disable tx clock gating for GC7000
rev6203") accidentally applied the fix for i.MX8MN errata ERR050226 to
GC2000 instead of GC7000, failing to disable tx clock gating for GC7000
rev 0x6023 as intended.

Additional clean-up further propagated this issue, partially breaking
the clock gating fixes added for GC7000 rev 6202 in commit 432f51e7deeda
("drm/etnaviv: add clock gating workaround for GC7000 r6202").

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

authored by

Derek Foreman and committed by
Lucas Stach d7a5c9de 4cece764

+2 -2
+2 -2
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
··· 663 663 /* Disable TX clock gating on affected core revisions. */ 664 664 if (etnaviv_is_model_rev(gpu, GC4000, 0x5222) || 665 665 etnaviv_is_model_rev(gpu, GC2000, 0x5108) || 666 - etnaviv_is_model_rev(gpu, GC2000, 0x6202) || 667 - etnaviv_is_model_rev(gpu, GC2000, 0x6203)) 666 + etnaviv_is_model_rev(gpu, GC7000, 0x6202) || 667 + etnaviv_is_model_rev(gpu, GC7000, 0x6203)) 668 668 pmc |= VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_TX; 669 669 670 670 /* Disable SE and RA clock gating on affected core revisions. */