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

Commit a624d2e7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Idff4fb92,Iae7dbc8c into msm-4.14 

* changes:
  msm: kgsl: Bypass GMU caches at boot
  msm: kgsl: Use API to configure DMA
parents 209f3f78 cc01e8fa

drivers/gpu/msm/a6xx_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -926,6 +926,8 @@ 
#define A6XX_GMU_DCVS_PERF_SETTING		0x1CBFD

#define A6XX_GMU_DCVS_BW_SETTING		0x1CBFE

#define A6XX_GMU_DCVS_RETURN			0x1CBFF

#define A6XX_GMU_ICACHE_CONFIG			0x1F400

#define A6XX_GMU_DCACHE_CONFIG			0x1F401

#define A6XX_GMU_SYS_BUS_CONFIG			0x1F40F

#define A6XX_GMU_CM3_SYSRESET			0x1F800

#define A6XX_GMU_CM3_BOOT_CONFIG		0x1F801

drivers/gpu/msm/adreno_a6xx.c

+3 −1
Original line number Diff line number Diff line
@@ -1475,8 +1475,10 @@ static void a6xx_gmu_power_config(struct kgsl_device *device) 


	/* Configure registers for idle setting. The setting is cumulative */



	/* Disable GMU WB/RB buffer */

	/* Disable GMU WB/RB buffer and caches at boot */

	kgsl_gmu_regwrite(device, A6XX_GMU_SYS_BUS_CONFIG, 0x1);

	kgsl_gmu_regwrite(device, A6XX_GMU_ICACHE_CONFIG, 0x1);

	kgsl_gmu_regwrite(device, A6XX_GMU_DCACHE_CONFIG, 0x1);



	kgsl_gmu_regwrite(device,

		A6XX_GMU_PWR_COL_INTER_FRAME_CTRL,  0x9C40400);

drivers/gpu/msm/kgsl_gmu.c

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static int gmu_iommu_cb_probe(struct gmu_device *gmu, 
	int ret;



	dev = &pdev->dev;

	of_dma_configure(dev, node);



	ctx->dev = dev;

	ctx->domain = iommu_domain_alloc(&platform_bus_type);
@@ -1372,6 +1373,7 @@ int gmu_probe(struct kgsl_device *device, unsigned long flags) 
	gmu->flags = flags;



	device->gmu.pdev = of_find_device_by_node(node);

	of_dma_configure(&gmu->pdev->dev, node);



	/* Set up GMU regulators */

	ret = gmu_regulators_probe(gmu, node);

drivers/gpu/msm/kgsl_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -2576,6 +2576,7 @@ static int _kgsl_iommu_cb_probe(struct kgsl_device *device, 
			return PTR_ERR(ctx->dev);

	}



	of_dma_configure(ctx->dev, node);

	return 0;

}