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

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

Merge "msm: kgsl: Do not delete uninitialized preempt timer"

parents d24203ad cb635fd5

drivers/gpu/msm/adreno_a5xx_preempt.c

+10 −2
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void a5xx_preemption_iommu_close(struct adreno_device *adreno_dev) 
}

#endif



void a5xx_preemption_close(struct adreno_device *adreno_dev)

static void _preemption_close(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct adreno_preemption *preempt = &adreno_dev->preempt;
@@ -578,6 +578,14 @@ void a5xx_preemption_close(struct adreno_device *adreno_dev) 
	}

}



void a5xx_preemption_close(struct adreno_device *adreno_dev)

{

	if (!test_bit(ADRENO_DEVICE_PREEMPTION, &adreno_dev->priv))

		return;



	_preemption_close(adreno_dev);

}



int a5xx_preemption_init(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
@@ -618,7 +626,7 @@ int a5xx_preemption_init(struct adreno_device *adreno_dev) 


err:

	if (ret)

		a5xx_preemption_close(adreno_dev);

		_preemption_close(adreno_dev);



	return ret;

}

drivers/gpu/msm/adreno_a6xx_preempt.c

+10 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static void a6xx_preemption_iommu_close(struct adreno_device *adreno_dev) 
}

#endif



void a6xx_preemption_close(struct adreno_device *adreno_dev)

static void _preemption_close(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct adreno_preemption *preempt = &adreno_dev->preempt;
@@ -691,6 +691,14 @@ void a6xx_preemption_close(struct adreno_device *adreno_dev) 
	}

}



void a6xx_preemption_close(struct adreno_device *adreno_dev)

{

	if (!test_bit(ADRENO_DEVICE_PREEMPTION, &adreno_dev->priv))

		return;



	_preemption_close(adreno_dev);

}



int a6xx_preemption_init(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
@@ -731,7 +739,7 @@ int a6xx_preemption_init(struct adreno_device *adreno_dev) 


err:

	if (ret)

		a6xx_preemption_close(adreno_dev);

		_preemption_close(adreno_dev);



	return ret;

}