Merge "msm: kgsl: Remove chipid from the legacy pdata struct" (8fd9411e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -1198,18 +1198,20 @@ static void
		adreno_identify_gpu(struct adreno_device *adreno_dev)
		{
		const struct adreno_reg_offsets *reg_offsets;
		struct kgsl_device_platform_data *pdata =
		dev_get_platdata(&(adreno_dev->dev.pdev->dev));
		struct adreno_gpudev *gpudev;
		int i;

		adreno_dev->chip_id = pdata->chipid;
		if (kgsl_property_read_u32(&adreno_dev->dev, "qcom,chipid",
		&adreno_dev->chipid))
		KGSL_DRV_FATAL(&adreno_dev->dev,
		"No GPU chip ID was specified\n");

		adreno_dev->gpucore = _get_gpu_core(adreno_dev->chip_id);
		adreno_dev->gpucore = _get_gpu_core(adreno_dev->chipid);

		if (adreno_dev->gpucore == NULL)
		KGSL_DRV_FATAL(&adreno_dev->dev, "Unknown GPU chip ID %8.8X\n",
		adreno_dev->chip_id);
		adreno_dev->chipid);

		/*
		* The gmem size might be dynamic when ocmem is involved so copy it out
		* of the gpu device
		@@ -1426,10 +1428,6 @@ static int adreno_of_get_pdata(struct platform_device *pdev)
		goto err;
		}

		if (adreno_of_read_property(pdev->dev.of_node, "qcom,chipid",
		&pdata->chipid))
		goto err;

		/* pwrlevel Data */
		ret = adreno_of_get_pwrlevels(pdev->dev.of_node, pdata);
		if (ret)
		@@ -2392,7 +2390,7 @@ static int adreno_getproperty(struct kgsl_device *device,

		memset(&devinfo, 0, sizeof(devinfo));
		devinfo.device_id = device->id+1;
		devinfo.chip_id = adreno_dev->chip_id;
		devinfo.chip_id = adreno_dev->chipid;
		devinfo.mmu_enabled = kgsl_mmu_enabled();
		devinfo.gmem_gpubaseaddr = adreno_dev->gmem_base;
		devinfo.gmem_sizebytes = adreno_dev->gmem_size;
		@@ -3097,7 +3095,7 @@ static unsigned int adreno_gpuid(struct kgsl_device *device,
		* that as a parameter */

		if (chipid != NULL)
		*chipid = adreno_dev->chip_id;
		*chipid = adreno_dev->chipid;

		/* Standard KGSL gpuid format:
		* top word is 0x0002 for 2D or 0x0003 for 3D

drivers/gpu/msm/adreno.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ struct adreno_gpu_core {
		struct adreno_device {
		struct kgsl_device dev; /* Must be first field in this struct */
		unsigned long priv;
		unsigned int chip_id;
		unsigned int chipid;
		unsigned long gmem_base;
		unsigned long gmem_size;
		const struct adreno_gpu_core *gpucore;
		@@ -781,13 +781,13 @@ static inline int adreno_is_a330(struct adreno_device *adreno_dev)
		static inline int adreno_is_a330v2(struct adreno_device *adreno_dev)
		{
		return ((ADRENO_GPUREV(adreno_dev) == ADRENO_REV_A330) &&
		(ADRENO_CHIPID_PATCH(adreno_dev->chip_id) > 0));
		(ADRENO_CHIPID_PATCH(adreno_dev->chipid) > 0));
		}

		static inline int adreno_is_a330v21(struct adreno_device *adreno_dev)
		{
		return ((ADRENO_GPUREV(adreno_dev) == ADRENO_REV_A330) &&
		(ADRENO_CHIPID_PATCH(adreno_dev->chip_id) > 0xF));
		(ADRENO_CHIPID_PATCH(adreno_dev->chipid) > 0xF));
		}

		static inline int adreno_is_a4xx(struct adreno_device *adreno_dev)

drivers/gpu/msm/adreno_compat.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ int adreno_getproperty_compat(struct kgsl_device *device,

		memset(&devinfo, 0, sizeof(devinfo));
		devinfo.device_id = device->id + 1;
		devinfo.chip_id = adreno_dev->chip_id;
		devinfo.chip_id = adreno_dev->chipid;
		devinfo.mmu_enabled = kgsl_mmu_enabled();
		devinfo.gmem_gpubaseaddr = adreno_dev->gmem_base;
		devinfo.gmem_sizebytes = adreno_dev->gmem_size;