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

Commit efd06830 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: Set a failed GMU register read to 0" into msm-4.9

parents 0a37f7ab 83454bf8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ static inline void adreno_read_gmureg(struct adreno_device *adreno_dev,
		kgsl_gmu_regread(KGSL_DEVICE(adreno_dev),
				gpudev->reg_offsets->offsets[offset_name], val);
	else
		*val = 0xDEADBEEF;
		*val = 0;
}

/*
+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static inline void kgsl_gmu_regread(struct kgsl_device *device,
	if (device->ftbl->gmu_regread)
		device->ftbl->gmu_regread(device, offsetwords, value);
	else
		*value = 0xDEADBEEF;
		*value = 0;
}

static inline void kgsl_gmu_regwrite(struct kgsl_device *device,