Commit 0efadfb0 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Dmitry Baryshkov
Browse files

drm/msm: Drop msm_read/writel 



Totally useless.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Patchwork: https://patchwork.freedesktop.org/patch/588804/
Link: https://lore.kernel.org/r/20240410-topic-msm_rw-v1-1-e1fede9ffaba@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent b662ade1

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

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void a6xx_rpmh_stop(struct a6xx_gmu *gmu) 


static inline void pdc_write(void __iomem *ptr, u32 offset, u32 value)

{

	msm_writel(value, ptr + (offset << 2));

	writel(value, ptr + (offset << 2));

}



static void __iomem *a6xx_gmu_get_mmio(struct platform_device *pdev,

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

+6 −6
Original line number Diff line number Diff line
@@ -103,12 +103,12 @@ struct a6xx_gmu { 


static inline u32 gmu_read(struct a6xx_gmu *gmu, u32 offset)

{

	return msm_readl(gmu->mmio + (offset << 2));

	return readl(gmu->mmio + (offset << 2));

}



static inline void gmu_write(struct a6xx_gmu *gmu, u32 offset, u32 value)

{

	msm_writel(value, gmu->mmio + (offset << 2));

	writel(value, gmu->mmio + (offset << 2));

}



static inline void
@@ -131,8 +131,8 @@ static inline u64 gmu_read64(struct a6xx_gmu *gmu, u32 lo, u32 hi) 
{

	u64 val;



	val = (u64) msm_readl(gmu->mmio + (lo << 2));

	val |= ((u64) msm_readl(gmu->mmio + (hi << 2)) << 32);

	val = (u64) readl(gmu->mmio + (lo << 2));

	val |= ((u64) readl(gmu->mmio + (hi << 2)) << 32);



	return val;

}
@@ -143,12 +143,12 @@ static inline u64 gmu_read64(struct a6xx_gmu *gmu, u32 lo, u32 hi) 


static inline u32 gmu_read_rscc(struct a6xx_gmu *gmu, u32 offset)

{

	return msm_readl(gmu->rscc + (offset << 2));

	return readl(gmu->rscc + (offset << 2));

}



static inline void gmu_write_rscc(struct a6xx_gmu *gmu, u32 offset, u32 value)

{

	msm_writel(value, gmu->rscc + (offset << 2));

	writel(value, gmu->rscc + (offset << 2));

}



#define gmu_poll_timeout_rscc(gmu, addr, val, cond, interval, timeout) \

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

+2 −2
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ static inline void a6xx_llc_rmw(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 mask, u3 


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

{

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

	return 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));

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

}



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

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

+2 −2
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ static int debugbus_read(struct msm_gpu *gpu, u32 block, u32 offset, 
}



#define cxdbg_write(ptr, offset, val) \

	msm_writel((val), (ptr) + ((offset) << 2))

	writel((val), (ptr) + ((offset) << 2))



#define cxdbg_read(ptr, offset) \

	msm_readl((ptr) + ((offset) << 2))

	readl((ptr) + ((offset) << 2))



/* read a value from the CX debug bus */

static int cx_debugbus_read(void __iomem *cxdbg, u32 block, u32 offset,

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h

+2 −2
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ struct mdp4_kms { 


static inline void mdp4_write(struct mdp4_kms *mdp4_kms, u32 reg, u32 data)

{

	msm_writel(data, mdp4_kms->mmio + reg);

	writel(data, mdp4_kms->mmio + reg);

}



static inline u32 mdp4_read(struct mdp4_kms *mdp4_kms, u32 reg)

{

	return msm_readl(mdp4_kms->mmio + reg);

	return readl(mdp4_kms->mmio + reg);

}



static inline uint32_t pipe2flush(enum mdp4_pipe pipe)