Merge "msm: kgsl: Add NULL check for preemption_schedule call" (bd22b4ce) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/adreno_dispatch.c

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -649,6 +649,7 @@ static int sendcmd(struct adreno_device *adreno_dev,
		* we just submitted something, readjust ringbuffer
		* execution level
		*/
		if (gpudev->preemption_schedule)
		gpudev->preemption_schedule(adreno_dev);
		return 0;
		}
		@@ -2116,6 +2117,7 @@ static void adreno_dispatcher_work(struct work_struct *work)
		if (dispatcher_do_fault(device))
		goto done;

		if (gpudev->preemption_schedule)
		gpudev->preemption_schedule(adreno_dev);

		if (cur_rb_id != adreno_dev->cur_rb->id) {