Merge "msm: kgsl: check kgsl state before accessing device registers" (b587143a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_dispatch.c

+20 −17

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, 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
		@@ -2094,6 +2094,22 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev)
		if (fault == 0)
		return 0;

		mutex_lock(&device->mutex);

		/*
		* In the very unlikely case that the power is off, do nothing - the
		* state will be reset on power up and everybody will be happy
		*/
		if (!kgsl_state_is_awake(device)) {
		mutex_unlock(&device->mutex);
		if (fault & ADRENO_SOFT_FAULT) {
		/* Clear the existing register values */
		memset(adreno_ft_regs_val, 0,
		adreno_ft_regs_num * sizeof(unsigned int));
		}
		return 0;
		}

		/* Mask all GMU interrupts */
		if (kgsl_gmu_isenabled(device)) {
		adreno_write_gmureg(adreno_dev,
		@@ -2107,17 +2123,6 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev)
		if (gpudev->gx_is_on)
		gx_on = gpudev->gx_is_on(adreno_dev);

		/*
		* In the very unlikely case that the power is off, do nothing - the
		* state will be reset on power up and everybody will be happy
		*/

		if (!kgsl_state_is_awake(device) && (fault & ADRENO_SOFT_FAULT)) {
		/* Clear the existing register values */
		memset(adreno_ft_regs_val, 0,
		adreno_ft_regs_num * sizeof(unsigned int));
		return 0;
		}

		/*
		* On A5xx and A6xx, read RBBM_STATUS3:SMMU_STALLED_ON_FAULT (BIT 24)
		@@ -2130,12 +2135,12 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev)
		gx_on) {
		unsigned int val;

		mutex_lock(&device->mutex);
		adreno_readreg(adreno_dev, ADRENO_REG_RBBM_STATUS3, &val);
		if (val & BIT(24)) {
		mutex_unlock(&device->mutex);
		if (val & BIT(24))
		return 0;
		}
		}

		/* Turn off all the timers */
		del_timer_sync(&dispatcher->timer);
		@@ -2147,8 +2152,6 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev)
		if (adreno_is_preemption_enabled(adreno_dev))
		del_timer_sync(&adreno_dev->preempt.timer);

		mutex_lock(&device->mutex);

		if (gx_on)
		adreno_readreg64(adreno_dev, ADRENO_REG_CP_RB_BASE,
		ADRENO_REG_CP_RB_BASE_HI, &base);