drm/etnaviv: determine product, customer and eco id (815e45bb) · Commits · 戴 / test

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -333,9 +333,13 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu)
		gpu->identity.revision = etnaviv_field(chipIdentity,
		VIVS_HI_CHIP_IDENTITY_REVISION);
		} else {
		u32 chipDate = gpu_read(gpu, VIVS_HI_CHIP_DATE);

		gpu->identity.model = gpu_read(gpu, VIVS_HI_CHIP_MODEL);
		gpu->identity.revision = gpu_read(gpu, VIVS_HI_CHIP_REV);
		gpu->identity.product_id = gpu_read(gpu, VIVS_HI_CHIP_PRODUCT_ID);
		gpu->identity.customer_id = gpu_read(gpu, VIVS_HI_CHIP_CUSTOMER_ID);
		gpu->identity.eco_id = gpu_read(gpu, VIVS_HI_CHIP_ECO_ID);

		/*
		* !!!! HACK ALERT !!!!
		@@ -350,7 +354,6 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu)

		/* Another special case */
		if (etnaviv_is_model_rev(gpu, GC300, 0x2201)) {
		u32 chipDate = gpu_read(gpu, VIVS_HI_CHIP_DATE);
		u32 chipTime = gpu_read(gpu, VIVS_HI_CHIP_TIME);

		if (chipDate == 0x20080814 && chipTime == 0x12051100) {
		@@ -373,6 +376,12 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu)
		gpu->identity.model = chipModel_GC3000;
		gpu->identity.revision &= 0xffff;
		}

		if (etnaviv_is_model_rev(gpu, GC1000, 0x5037) && (chipDate == 0x20120617))
		gpu->identity.eco_id = 1;

		if (etnaviv_is_model_rev(gpu, GC320, 0x5303) && (chipDate == 0x20140511))
		gpu->identity.eco_id = 1;
		}

		dev_info(gpu->dev, "model: GC%x, revision: %x\n",

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,11 +15,11 @@ struct etnaviv_gem_submit;
		struct etnaviv_vram_mapping;

		struct etnaviv_chip_identity {
		/* Chip model. */
		u32 model;

		/* Revision value.*/
		u32 revision;
		u32 product_id;
		u32 customer_id;
		u32 eco_id;

		/* Supported feature fields. */
		u32 features;