Commit 13ef096e authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Rob Clark
Browse files

drm/msm/adreno: Make adreno quirks not overwrite each other 



So far the adreno quirks have all been assigned with an OR operator,
which is problematic, because they were assigned consecutive integer
values, which makes checking them with an AND operator kind of no bueno..

Switch to using BIT(n) so that only the quirks that the programmer chose
are taken into account when evaluating info->quirks & ADRENO_QUIRK_...

Fixes: 370063ee ("drm/msm/adreno: Add A540 support")
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/516456/
Link: https://lore.kernel.org/r/20230102100201.77286-1-konrad.dybcio@linaro.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 00dd060a

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+4 −6
Original line number Diff line number Diff line
@@ -29,11 +29,9 @@ enum { 
	ADRENO_FW_MAX,

};



enum adreno_quirks {

	ADRENO_QUIRK_TWO_PASS_USE_WFI = 1,

	ADRENO_QUIRK_FAULT_DETECT_MASK = 2,

	ADRENO_QUIRK_LMLOADKILL_DISABLE = 3,

};

#define ADRENO_QUIRK_TWO_PASS_USE_WFI		BIT(0)

#define ADRENO_QUIRK_FAULT_DETECT_MASK		BIT(1)

#define ADRENO_QUIRK_LMLOADKILL_DISABLE		BIT(2)



struct adreno_rev {

	uint8_t  core;
@@ -65,7 +63,7 @@ struct adreno_info { 
	const char *name;

	const char *fw[ADRENO_FW_MAX];

	uint32_t gmem;

	enum adreno_quirks quirks;

	u64 quirks;

	struct msm_gpu *(*init)(struct drm_device *dev);

	const char *zapfw;

	u32 inactive_period;