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

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

Merge "msm: kgsl: Stop fault_timer before reading fault registers"

parents 38cdabcf 69f65653

drivers/gpu/msm/adreno_dispatch.c

+7 −3
Original line number Diff line number Diff line
@@ -576,8 +576,15 @@ static int sendcmd(struct adreno_device *adreno_dev, 


	if (dispatcher->inflight == 1) {

		if (ret == 0) {



			/* Stop fault timer before reading fault registers */

			del_timer_sync(&dispatcher->fault_timer);



			fault_detect_read(adreno_dev);



			/* Start the fault timer on first submission */

			start_fault_timer(adreno_dev);



			if (!test_and_set_bit(ADRENO_DISPATCHER_ACTIVE,

				&dispatcher->priv))

				reinit_completion(&dispatcher->idle_gate);
@@ -637,9 +644,6 @@ static int sendcmd(struct adreno_device *adreno_dev, 
		mod_timer(&dispatcher->timer, cmdbatch->expires);

	}



	/* Start the fault detection timer on the first submission */

	if (dispatcher->inflight == 1)

		start_fault_timer(adreno_dev);



	/*

	 * we just submitted something, readjust ringbuffer