Commit d803592e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/dp: move I/O functions to global header 



Move msm_dp_read()/msm_write_foo() functions to the dp_catalog.h,
allowing other modules to access the data directly.

Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Tested-by: Stephen Boyd <swboyd@chromium.org> # sc7180-trogdor
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/654318/
Link: https://lore.kernel.org/r/20250518-fd-dp-audio-fixup-v6-4-2f0ec3ec000d@oss.qualcomm.com
parent 56d802f6

drivers/gpu/drm/msm/dp/dp_catalog.c

+0 −65
Original line number Diff line number Diff line
@@ -81,71 +81,6 @@ void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_d 
				    msm_dp_catalog->p0_len, msm_dp_catalog->p0_base, "dp_p0");

}



static inline u32 msm_dp_read_aux(struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->aux_base + offset);

}



static inline void msm_dp_write_aux(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure aux reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->aux_base + offset);

}



static inline u32 msm_dp_read_ahb(const struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->ahb_base + offset);

}



static inline void msm_dp_write_ahb(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure phy reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->ahb_base + offset);

}



static inline void msm_dp_write_p0(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure interface reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->p0_base + offset);

}



static inline u32 msm_dp_read_p0(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset)

{

	/*

	 * To make sure interface reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	return readl_relaxed(msm_dp_catalog->p0_base + offset);

}



static inline u32 msm_dp_read_link(struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->link_base + offset);

}



static inline void msm_dp_write_link(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure link reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->link_base + offset);

}



/* aux related catalog functions */

u32 msm_dp_catalog_aux_read_data(struct msm_dp_catalog *msm_dp_catalog)

{

drivers/gpu/drm/msm/dp/dp_catalog.h

+62 −0
Original line number Diff line number Diff line
@@ -48,6 +48,68 @@ struct msm_dp_catalog { 
	size_t p0_len;

};



/* IO */

static inline u32 msm_dp_read_aux(struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->aux_base + offset);

}



static inline void msm_dp_write_aux(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure aux reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->aux_base + offset);

}



static inline u32 msm_dp_read_ahb(const struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->ahb_base + offset);

}



static inline void msm_dp_write_ahb(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure phy reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->ahb_base + offset);

}



static inline void msm_dp_write_p0(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure interface reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->p0_base + offset);

}



static inline u32 msm_dp_read_p0(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset)

{

	return readl_relaxed(msm_dp_catalog->p0_base + offset);

}



static inline u32 msm_dp_read_link(struct msm_dp_catalog *msm_dp_catalog, u32 offset)

{

	return readl_relaxed(msm_dp_catalog->link_base + offset);

}



static inline void msm_dp_write_link(struct msm_dp_catalog *msm_dp_catalog,

			       u32 offset, u32 data)

{

	/*

	 * To make sure link reg writes happens before any other operation,

	 * this function uses writel() instread of writel_relaxed()

	 */

	writel(data, msm_dp_catalog->link_base + offset);

}



/* Debug module */

void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_disp_state *disp_state);