Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e44bfef5 authored by Doug Brown's avatar Doug Brown Committed by Greg Kroah-Hartman
Browse files

drm/etnaviv: add missing quirks for GC300 



[ Upstream commit cc7d3fb446a91f24978a6aa59cbb578f92e22242 ]

The GC300's features register doesn't specify that a 2D pipe is
available, and like the GC600, its idle register reports zero bits where
modules aren't present.

Signed-off-by: default avatarDoug Brown <doug@schmorgal.com>
Reviewed-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 90103ccb

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+9 −2
Original line number Diff line number Diff line
@@ -392,6 +392,12 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) 
	if (gpu->identity.model == chipModel_GC700)

		gpu->identity.features &= ~chipFeatures_FAST_CLEAR;



	/* These models/revisions don't have the 2D pipe bit */

	if ((gpu->identity.model == chipModel_GC500 &&

	     gpu->identity.revision <= 2) ||

	    gpu->identity.model == chipModel_GC300)

		gpu->identity.features |= chipFeatures_PIPE_2D;



	if ((gpu->identity.model == chipModel_GC500 &&

	     gpu->identity.revision < 2) ||

	    (gpu->identity.model == chipModel_GC300 &&
@@ -425,8 +431,9 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) 
				gpu_read(gpu, VIVS_HI_CHIP_MINOR_FEATURE_5);

	}



	/* GC600 idle register reports zero bits where modules aren't present */

	if (gpu->identity.model == chipModel_GC600)

	/* GC600/300 idle register reports zero bits where modules aren't present */

	if (gpu->identity.model == chipModel_GC600 ||

	    gpu->identity.model == chipModel_GC300)

		gpu->idle_mask = VIVS_HI_IDLE_STATE_TX |

				 VIVS_HI_IDLE_STATE_RA |

				 VIVS_HI_IDLE_STATE_SE |