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

Commit 0e2097ce authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: fix a condition error and set L3 clock rate fail"

parents 59203983 f7cdc2d4

drivers/gpu/msm/adreno.c

+3 −1
Original line number Diff line number Diff line
@@ -1023,9 +1023,11 @@ l3_pwrlevel_probe(struct kgsl_device *device, struct device_node *node) 


	device->l3_clk = devm_clk_get(&device->pdev->dev, "l3_vote");



	if (IS_ERR_OR_NULL(device->l3_clk))

	if (IS_ERR_OR_NULL(device->l3_clk)) {

		dev_err(&device->pdev->dev,

			"Unable to get the l3_vote clock\n");

		device->l3_clk = NULL;

	}

}



static int adreno_of_get_power(struct adreno_device *adreno_dev,

drivers/gpu/msm/adreno_a6xx_gmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static int a6xx_gmu_enable_clks(struct adreno_device *adreno_dev) 
	}



	ret = a6xx_gmu_clk_set_rate(gmu, "hub_clk", 150000000);

	if (ret && ret != ENODEV) {

	if (ret && ret != -ENODEV) {

		dev_err(&gmu->pdev->dev, "Unable to set the HUB clock\n");

		return ret;

	}

drivers/gpu/msm/adreno_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ static void adreno_ringbuffer_set_constraint(struct kgsl_device *device, 
		((context->flags & KGSL_CONTEXT_PWR_CONSTRAINT) ||

			(flags & KGSL_CONTEXT_PWR_CONSTRAINT))) {



		if (IS_ERR_OR_NULL(device->l3_clk)) {

		if (device->l3_clk == NULL) {

			dev_err_once(device->dev,

				"l3_vote clk not available\n");

			return;