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

drm/msm/a6xx: Move LLC accessors to the common header 



Move these wrappers in preparation for use in a6xx_gmu.c

Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # sm8450
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/551824/


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

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+0 −15
Original line number Diff line number Diff line
@@ -1735,21 +1735,6 @@ static irqreturn_t a6xx_irq(struct msm_gpu *gpu) 
	return IRQ_HANDLED;

}



static void a6xx_llc_rmw(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 mask, u32 or)

{

	return msm_rmw(a6xx_gpu->llc_mmio + (reg << 2), mask, or);

}



static u32 a6xx_llc_read(struct a6xx_gpu *a6xx_gpu, u32 reg)

{

	return msm_readl(a6xx_gpu->llc_mmio + (reg << 2));

}



static void a6xx_llc_write(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 value)

{

	msm_writel(value, a6xx_gpu->llc_mmio + (reg << 2));

}



static void a6xx_llc_deactivate(struct a6xx_gpu *a6xx_gpu)

{

	llcc_slice_deactivate(a6xx_gpu->llc_slice);

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

+15 −0
Original line number Diff line number Diff line
@@ -62,6 +62,21 @@ static inline bool a6xx_has_gbif(struct adreno_gpu *gpu) 
	return true;

}



static inline void a6xx_llc_rmw(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 mask, u32 or)

{

	return msm_rmw(a6xx_gpu->llc_mmio + (reg << 2), mask, or);

}



static inline u32 a6xx_llc_read(struct a6xx_gpu *a6xx_gpu, u32 reg)

{

	return msm_readl(a6xx_gpu->llc_mmio + (reg << 2));

}



static inline void a6xx_llc_write(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 value)

{

	msm_writel(value, a6xx_gpu->llc_mmio + (reg << 2));

}



#define shadowptr(_a6xx_gpu, _ring) ((_a6xx_gpu)->shadow_iova + \

		((_ring)->id * sizeof(uint32_t)))