drm/msm/dp: perform misc cleanups
cover drm/msm/dp: perform misc cleanups
- Fix register programming in the dp_audio module
- Rework most of the register programming functions to be local to the calling module rather than accessing everything through huge dp_catalog monster.
---
Dmitry Baryshkov (14):
drm/msm/dp: fix msm_dp_utils_pack_sdp_header interface drm/msm/dp: drop msm_dp_panel_dump_regs() and msm_dp_catalog_dump_regs() drm/msm/dp: drop msm_dp_panel_tpg_config()
drm/msm/dp: pull I/O data out of msm_dp_catalog_private() drm/msm/dp: move I/O functions to global header
drm/msm/dp: move/inline AUX register functions
drm/msm/dp: move/inline ctrl register functions
drm/msm/dp: move/inline panel related functions
drm/msm/dp: use msm_dp_utils_pack_sdp_header() for audio packets drm/msm/dp: drop obsolete audio headers access through catalog drm/msm/dp: move/inline audio related functions
drm/msm/dp: move more AUX functions to dp_aux.c
drm/msm/dp: drop struct msm_dp_panel_in
drm/msm/dp: move interrupt handling to dp_ctrl
drivers/gpu/drm/msm/dp/dp_audio.c | 360 ++++------ drivers/gpu/drm/msm/dp/dp_aux.c | 195 +++++- drivers/gpu/drm/msm/dp/dp_aux.h | 9 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 1267 +---------------------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 177 +++-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 575 ++++++++++++++-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 5 +- drivers/gpu/drm/msm/dp/dp_display.c | 36 +- drivers/gpu/drm/msm/dp/dp_panel.c | 150 +++-- drivers/gpu/drm/msm/dp/dp_panel.h | 15 +- drivers/gpu/drm/msm/dp/dp_reg.h | 17 + drivers/gpu/drm/msm/dp/dp_utils.c | 10 +- drivers/gpu/drm/msm/dp/dp_utils.h | 2 +- 13 files changed, 1078 insertions(+), 1740 deletions(-)
---
base-commit: 74741a050b79d31d8d2eeee12c77736596d0a6b2
change-id: 20240615-fd-dp-audio-fixup-a92883ea9e40
Best regards,
Signature · 1 line
Dmitry Baryshkov <[email protected]>
PATCH 1/14 drm/msm/dp: fix msm_dp_utils_pack_sdp_header interface
The msm_dp_utils_pack_sdp_header() accepts an unlimited-size u32 pointer for the header output, while it expects a two-element array. It performs a sizeof check which is always true on 64-bit platforms (since sizeof(u32*) is 8) and is always falce on 32-bit platforms. It returns an error code which nobody actually checks.
Fix the function interface to accept u32[2] and return void, skipping all the checks.
--- drivers/gpu/drm/msm/dp/dp_utils.c | 10 +--------- drivers/gpu/drm/msm/dp/dp_utils.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/dp/dp_utils.c +1 -9
@@ -74,14 +74,8 @@ u8 msm_dp_utils_calculate_parity(u32 data)return parity_byte; } -ssize_t msm_dp_utils_pack_sdp_header (struct dp_sdp_header *sdp_header,u32 *header_buff) +void msm_dp_utils_pack_sdp_header (struct dp_sdp_header *sdp_header,u32 header_buff[2 ]) { -size_t length; - - length =sizeof (header_buff); -if (length <DP_SDP_HEADER_SIZE ) -return -ENOSPC ; - header_buff[0 ] =FIELD_PREP (HEADER_0_MASK , sdp_header->HB0) |FIELD_PREP (PARITY_0_MASK ,msm_dp_utils_calculate_parity (sdp_header->HB0)) | FIELD_PREP(HEADER_1_MASK, sdp_header->HB1) |
@@ -91,6 +85,4 @@ ssize_t msm_dp_utils_pack_sdp_header(struct dp_sdp_header *sdp_header, u32 *headFIELD_PREP (PARITY_2_MASK ,msm_dp_utils_calculate_parity (sdp_header->HB2)) |FIELD_PREP (HEADER_3_MASK , sdp_header->HB3) |FIELD_PREP (PARITY_3_MASK ,msm_dp_utils_calculate_parity (sdp_header->HB3)); - -return length; }
drivers/gpu/drm/msm/dp/dp_utils.h +1 -1
@@ -31,6 +31,6 @@u8 msm_dp_utils_get_g0_value (u8 data);u8 msm_dp_utils_get_g1_value (u8 data);u8 msm_dp_utils_calculate_parity (u32 data); -ssize_t msm_dp_utils_pack_sdp_header (struct dp_sdp_header *sdp_header,u32 *header_buff); +void msm_dp_utils_pack_sdp_header (struct dp_sdp_header *sdp_header,u32 header_buff[2 ]);#endif /* _DP_UTILS_H_ */
Signature · 1 line
2.39.5
PATCH 2/14 drm/msm/dp: drop msm_dp_panel_dump_regs() and msm_dp_catalog_dump_regs()
In reply to Dmitry BaryshkovThe msm_dp_panel_dump_regs() and msm_dp_catalog_dump_regs() are not called anywhere. If there is a necessity to dump registers, the snapshotting should be used instead. Drop these two functions.
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 37 ------------------------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 1 - drivers/gpu/drm/msm/dp/dp_panel.c | 11 ----------- drivers/gpu/drm/msm/dp/dp_panel.h | 1 - 4 files changed, 50 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -37
@@ -276,43 +276,6 @@ int msm_dp_catalog_aux_wait_for_hpd_connect_state(struct msm_dp_catalog *msm_dp_ min(wait_us, 2000), wait_us); } -static void dump_regs (void __iomem *base,int len) -{ -int i; -u32 x0, x4, x8, xc; -u32 addr_off =0 ; - - len =DIV_ROUND_UP (len,16 ); -for (i =0 ; i < len; i++) { - x0 =readl_relaxed (base + addr_off); - x4 =readl_relaxed (base + addr_off +0x04 ); - x8 =readl_relaxed (base + addr_off +0x08 ); - xc =readl_relaxed (base + addr_off +0x0c ); - -pr_info ("%08x: %08x %08x %08x %08x" , addr_off, x0, x4, x8, xc); - addr_off +=16 ; - } -} - -void msm_dp_catalog_dump_regs (struct msm_dp_catalog *msm_dp_catalog) -{ -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); -struct dss_io_data *io = &catalog->io; - -pr_info ("AHB regs\n" ); -dump_regs (io->ahb.base, io->ahb.len); - -pr_info ("AUXCLK regs\n" ); -dump_regs (io->aux.base, io->aux.len); - -pr_info ("LCLK regs\n" ); -dump_regs (io->link.base, io->link.len); - -pr_info ("P0CLK regs\n" ); -dump_regs (io->p0.base, io->p0.len); -} -u32 msm_dp_catalog_aux_get_irq (struct msm_dp_catalog *msm_dp_catalog) { struct msm_dp_catalog_private *catalog = container_of(msm_dp_catalog,
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -1
@@ -104,7 +104,6 @@ int msm_dp_catalog_panel_timing_cfg(struct msm_dp_catalog *msm_dp_catalog, u32 t u32 sync_start, u32 width_blanking, u32 msm_dp_active);void msm_dp_catalog_panel_enable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp);void msm_dp_catalog_panel_disable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_dump_regs (struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_panel_tpg_enable (struct msm_dp_catalog *msm_dp_catalog,struct drm_display_mode *drm_mode);void msm_dp_catalog_panel_tpg_disable (struct msm_dp_catalog *msm_dp_catalog);
drivers/gpu/drm/msm/dp/dp_panel.c +0 -11
@@ -317,17 +317,6 @@ static int msm_dp_panel_setup_vsc_sdp_yuv_420(struct msm_dp_panel *msm_dp_panel)return 0 ; } -void msm_dp_panel_dump_regs (struct msm_dp_panel *msm_dp_panel) -{ -struct msm_dp_catalog *catalog; -struct msm_dp_panel_private *panel; - - panel = container_of(msm_dp_panel, struct msm_dp_panel_private, msm_dp_panel); - catalog = panel->catalog; - -msm_dp_catalog_dump_regs (catalog); -} -int msm_dp_panel_timing_cfg (struct msm_dp_panel *msm_dp_panel) {u32 data, total_ver, total_hor;
drivers/gpu/drm/msm/dp/dp_panel.h +0 -1
@@ -55,7 +55,6 @@ struct msm_dp_panel {int msm_dp_panel_init_panel_info (struct msm_dp_panel *msm_dp_panel);int msm_dp_panel_deinit (struct msm_dp_panel *msm_dp_panel);int msm_dp_panel_timing_cfg (struct msm_dp_panel *msm_dp_panel); -void msm_dp_panel_dump_regs (struct msm_dp_panel *msm_dp_panel);int msm_dp_panel_read_sink_caps (struct msm_dp_panel *msm_dp_panel,struct drm_connector *connector); u32 msm_dp_panel_get_mode_bpp(struct msm_dp_panel *msm_dp_panel, u32 mode_max_bpp,
Signature · 1 line
2.39.5
PATCH 3/14 drm/msm/dp: drop msm_dp_panel_tpg_config()
In reply to Dmitry BaryshkovDrop even more dead code. The msm_dp_panel_tpg_config() has never been called. Drop it and the implementation inside dp_catalog.c
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 78 ------------------------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 3 -- drivers/gpu/drm/msm/dp/dp_panel.c | 28 ------------- drivers/gpu/drm/msm/dp/dp_panel.h | 1 - 4 files changed, 110 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -78
@@ -963,84 +963,6 @@ void msm_dp_catalog_panel_disable_vsc_sdp(struct msm_dp_catalog *msm_dp_catalog)msm_dp_catalog_panel_update_sdp (msm_dp_catalog); } -void msm_dp_catalog_panel_tpg_enable (struct msm_dp_catalog *msm_dp_catalog, -struct drm_display_mode *drm_mode) -{ -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); -u32 hsync_period, vsync_period; -u32 display_v_start, display_v_end; -u32 hsync_start_x, hsync_end_x; -u32 v_sync_width; -u32 hsync_ctl; -u32 display_hctl; - -/* TPG config parameters*/ - hsync_period = drm_mode->htotal; - vsync_period = drm_mode->vtotal; - - display_v_start = ((drm_mode->vtotal - drm_mode->vsync_start) * - hsync_period); - display_v_end = ((vsync_period - (drm_mode->vsync_start - - drm_mode->vdisplay)) - * hsync_period) -1 ; - - display_v_start += drm_mode->htotal - drm_mode->hsync_start; - display_v_end -= (drm_mode->hsync_start - drm_mode->hdisplay); - - hsync_start_x = drm_mode->htotal - drm_mode->hsync_start; - hsync_end_x = hsync_period - (drm_mode->hsync_start - - drm_mode->hdisplay) -1 ; - - v_sync_width = drm_mode->vsync_end - drm_mode->vsync_start; - - hsync_ctl = (hsync_period <<16 ) | - (drm_mode->hsync_end - drm_mode->hsync_start); - display_hctl = (hsync_end_x <<16 ) | hsync_start_x; - - -msm_dp_write_p0 (catalog,MMSS_DP_INTF_CONFIG ,0x0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_HSYNC_CTL , hsync_ctl); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_VSYNC_PERIOD_F0 , vsync_period * - hsync_period); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_VSYNC_PULSE_WIDTH_F0 , v_sync_width * - hsync_period); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_VSYNC_PERIOD_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_VSYNC_PULSE_WIDTH_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_DISPLAY_HCTL , display_hctl); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_ACTIVE_HCTL ,0 ); -msm_dp_write_p0 (catalog,MMSS_INTF_DISPLAY_V_START_F0 , display_v_start); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_DISPLAY_V_END_F0 , display_v_end); -msm_dp_write_p0 (catalog,MMSS_INTF_DISPLAY_V_START_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_DISPLAY_V_END_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_ACTIVE_V_START_F0 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_ACTIVE_V_END_F0 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_ACTIVE_V_START_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_ACTIVE_V_END_F1 ,0 ); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_POLARITY_CTL ,0 ); - -msm_dp_write_p0 (catalog,MMSS_DP_TPG_MAIN_CONTROL , -DP_TPG_CHECKERED_RECT_PATTERN ); -msm_dp_write_p0 (catalog,MMSS_DP_TPG_VIDEO_CONFIG , -DP_TPG_VIDEO_CONFIG_BPP_8BIT | -DP_TPG_VIDEO_CONFIG_RGB ); -msm_dp_write_p0 (catalog,MMSS_DP_BIST_ENABLE , -DP_BIST_ENABLE_DPBIST_EN ); -msm_dp_write_p0 (catalog,MMSS_DP_TIMING_ENGINE_EN , -DP_TIMING_ENGINE_EN_EN ); -drm_dbg_dp (catalog->drm_dev,"%s: enabled tpg\n" , __func__); -} - -void msm_dp_catalog_panel_tpg_disable (struct msm_dp_catalog *msm_dp_catalog) -{ -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_p0 (catalog,MMSS_DP_TPG_MAIN_CONTROL ,0x0 ); -msm_dp_write_p0 (catalog,MMSS_DP_BIST_ENABLE ,0x0 ); -msm_dp_write_p0 (catalog,MMSS_DP_TIMING_ENGINE_EN ,0x0 ); -} -static void __iomem *msm_dp_ioremap (struct platform_device *pdev,int idx,size_t *len) {struct resource *res;
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -3
@@ -104,9 +104,6 @@ int msm_dp_catalog_panel_timing_cfg(struct msm_dp_catalog *msm_dp_catalog, u32 t u32 sync_start, u32 width_blanking, u32 msm_dp_active);void msm_dp_catalog_panel_enable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp);void msm_dp_catalog_panel_disable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_panel_tpg_enable (struct msm_dp_catalog *msm_dp_catalog, -struct drm_display_mode *drm_mode); -void msm_dp_catalog_panel_tpg_disable (struct msm_dp_catalog *msm_dp_catalog);struct msm_dp_catalog *msm_dp_catalog_get (struct device *dev);
drivers/gpu/drm/msm/dp/dp_panel.c +0 -28
@@ -242,34 +242,6 @@ void msm_dp_panel_handle_sink_request(struct msm_dp_panel *msm_dp_panel) } } -void msm_dp_panel_tpg_config (struct msm_dp_panel *msm_dp_panel,bool enable) -{ -struct msm_dp_catalog *catalog; -struct msm_dp_panel_private *panel; - -if (!msm_dp_panel) { -DRM_ERROR ("invalid input\n" ); -return ; - } - - panel = container_of(msm_dp_panel, struct msm_dp_panel_private, msm_dp_panel); - catalog = panel->catalog; - -if (!panel->panel_on) { -drm_dbg_dp (panel->drm_dev, -"DP panel not enabled, handle TPG on next on\n" ); -return ; - } - -if (!enable) { -msm_dp_catalog_panel_tpg_disable (catalog); -return ; - } - -drm_dbg_dp (panel->drm_dev,"calling catalog tpg_enable\n" ); -msm_dp_catalog_panel_tpg_enable (catalog, &panel->msm_dp_panel.msm_dp_mode.drm_mode); -} -static int msm_dp_panel_setup_vsc_sdp_yuv_420 (struct msm_dp_panel *msm_dp_panel) {struct msm_dp_catalog *catalog;
drivers/gpu/drm/msm/dp/dp_panel.h +0 -1
@@ -62,7 +62,6 @@ u32 msm_dp_panel_get_mode_bpp(struct msm_dp_panel *msm_dp_panel, u32 mode_max_bpint msm_dp_panel_get_modes (struct msm_dp_panel *msm_dp_panel,struct drm_connector *connector);void msm_dp_panel_handle_sink_request (struct msm_dp_panel *msm_dp_panel); -void msm_dp_panel_tpg_config (struct msm_dp_panel *msm_dp_panel,bool enable);/** * is_link_rate_valid() - validates the link rate
Signature · 1 line
2.39.5
PATCH 4/14 drm/msm/dp: pull I/O data out of msm_dp_catalog_private()
In reply to Dmitry BaryshkovHaving I/O regions inside a msm_dp_catalog_private() results in extra layers of one-line wrappers for accessing the data. Move I/O region base and size to the globally visible struct msm_dp_catalog.
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 453 ++++++++++++++---------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 12 + 2 files changed, 193 insertions(+), 272 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +181 -272
@@ -63,155 +63,124 @@#define DP_DEFAULT_P0_OFFSET 0x1000#define DP_DEFAULT_P0_SIZE 0x0400 -struct dss_io_region { -size_t len; -void __iomem *base; -}; - -struct dss_io_data { -struct dss_io_region ahb; -struct dss_io_region aux; -struct dss_io_region link; -struct dss_io_region p0; -}; -struct msm_dp_catalog_private {struct device *dev;struct drm_device *drm_dev; -struct dss_io_data io;u32 (*audio_map)[DP_AUDIO_SDP_HEADER_MAX ];struct msm_dp_catalog msm_dp_catalog; };void msm_dp_catalog_snapshot (struct msm_dp_catalog *msm_dp_catalog,struct msm_disp_state *disp_state) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); -struct dss_io_data *dss = &catalog->io; - -msm_disp_snapshot_add_block (disp_state, dss->ahb.len, dss->ahb.base,"dp_ahb" ); -msm_disp_snapshot_add_block (disp_state, dss->aux.len, dss->aux.base,"dp_aux" ); -msm_disp_snapshot_add_block (disp_state, dss->link.len, dss->link.base,"dp_link" ); -msm_disp_snapshot_add_block (disp_state, dss->p0.len, dss->p0.base,"dp_p0" ); +msm_disp_snapshot_add_block (disp_state, msm_dp_catalog->ahb_len, msm_dp_catalog->ahb_base,"dp_ahb" ); +msm_disp_snapshot_add_block (disp_state, msm_dp_catalog->aux_len, msm_dp_catalog->aux_base,"dp_aux" ); +msm_disp_snapshot_add_block (disp_state, msm_dp_catalog->link_len, msm_dp_catalog->link_base,"dp_link" ); +msm_disp_snapshot_add_block (disp_state, msm_dp_catalog->p0_len, msm_dp_catalog->p0_base,"dp_p0" ); } -static inline u32 msm_dp_read_aux (struct msm_dp_catalog_private *catalog,u32 offset) +static inline u32 msm_dp_read_aux (struct msm_dp_catalog *msm_dp_catalog,u32 offset) { -return readl_relaxed (catalog->io.aux.base + offset); +return readl_relaxed (msm_dp_catalog->aux_base + offset); } -static inline void msm_dp_write_aux (struct msm_dp_catalog_private *catalog, +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, catalog->io.aux.base + offset); +writel (data, msm_dp_catalog->aux_base + offset); } -static inline u32 msm_dp_read_ahb (const struct msm_dp_catalog_private *catalog,u32 offset) +static inline u32 msm_dp_read_ahb (const struct msm_dp_catalog *msm_dp_catalog,u32 offset) { -return readl_relaxed (catalog->io.ahb.base + offset); +return readl_relaxed (msm_dp_catalog->ahb_base + offset); } -static inline void msm_dp_write_ahb (struct msm_dp_catalog_private *catalog, +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, catalog->io.ahb.base + offset); +writel (data, msm_dp_catalog->ahb_base + offset); } -static inline void msm_dp_write_p0 (struct msm_dp_catalog_private *catalog, +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, catalog->io.p0.base + offset); +writel (data, msm_dp_catalog->p0_base + offset); } -static inline u32 msm_dp_read_p0 (struct msm_dp_catalog_private *catalog, +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 (catalog->io.p0.base + offset); +return readl_relaxed (msm_dp_catalog->p0_base + offset); } -static inline u32 msm_dp_read_link (struct msm_dp_catalog_private *catalog,u32 offset) +static inline u32 msm_dp_read_link (struct msm_dp_catalog *msm_dp_catalog,u32 offset) { -return readl_relaxed (catalog->io.link.base + offset); +return readl_relaxed (msm_dp_catalog->link_base + offset); } -static inline void msm_dp_write_link (struct msm_dp_catalog_private *catalog, +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, catalog->io.link.base + offset); +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) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -return msm_dp_read_aux (catalog,REG_DP_AUX_DATA ); +return msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_DATA ); }int msm_dp_catalog_aux_write_data (struct msm_dp_catalog *msm_dp_catalog,u32 data) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_aux (catalog,REG_DP_AUX_DATA , data); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_DATA , data);return 0 ; }int msm_dp_catalog_aux_write_trans (struct msm_dp_catalog *msm_dp_catalog,u32 data) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_aux (catalog,REG_DP_AUX_TRANS_CTRL , data); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_TRANS_CTRL , data);return 0 ; }int msm_dp_catalog_aux_clear_trans (struct msm_dp_catalog *msm_dp_catalog,bool read) {u32 data; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);if (read) { - data =msm_dp_read_aux (catalog,REG_DP_AUX_TRANS_CTRL ); + data =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_TRANS_CTRL ); data &= ~DP_AUX_TRANS_CTRL_GO ; -msm_dp_write_aux (catalog,REG_DP_AUX_TRANS_CTRL , data); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_TRANS_CTRL , data); }else { -msm_dp_write_aux (catalog,REG_DP_AUX_TRANS_CTRL ,0 ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_TRANS_CTRL ,0 ); }return 0 ; }int msm_dp_catalog_aux_clear_hw_interrupts (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_read_aux (catalog,REG_DP_PHY_AUX_INTERRUPT_STATUS ); -msm_dp_write_aux (catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x1f ); -msm_dp_write_aux (catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x9f ); -msm_dp_write_aux (catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0 ); +msm_dp_read_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_STATUS ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x1f ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x9f ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0 );return 0 ; }
@@ -230,47 +199,41 @@ int msm_dp_catalog_aux_clear_hw_interrupts(struct msm_dp_catalog *msm_dp_catalogvoid msm_dp_catalog_aux_reset (struct msm_dp_catalog *msm_dp_catalog) {u32 aux_ctrl; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - aux_ctrl =msm_dp_read_aux (catalog,REG_DP_AUX_CTRL ); + aux_ctrl =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_CTRL ); aux_ctrl |=DP_AUX_CTRL_RESET ; -msm_dp_write_aux (catalog,REG_DP_AUX_CTRL , aux_ctrl); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl);usleep_range (1000 ,1100 );/* h/w recommended delay */ aux_ctrl &= ~DP_AUX_CTRL_RESET ; -msm_dp_write_aux (catalog,REG_DP_AUX_CTRL , aux_ctrl); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); }void msm_dp_catalog_aux_enable (struct msm_dp_catalog *msm_dp_catalog,bool enable) {u32 aux_ctrl; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - aux_ctrl =msm_dp_read_aux (catalog,REG_DP_AUX_CTRL ); + aux_ctrl =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_CTRL );if (enable) { -msm_dp_write_aux (catalog,REG_DP_TIMEOUT_COUNT ,0xffff ); -msm_dp_write_aux (catalog,REG_DP_AUX_LIMITS ,0xffff ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_TIMEOUT_COUNT ,0xffff ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_LIMITS ,0xffff ); aux_ctrl |=DP_AUX_CTRL_ENABLE ; }else { aux_ctrl &= ~DP_AUX_CTRL_ENABLE ; } -msm_dp_write_aux (catalog,REG_DP_AUX_CTRL , aux_ctrl); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); }int msm_dp_catalog_aux_wait_for_hpd_connect_state (struct msm_dp_catalog *msm_dp_catalog,unsigned long wait_us) {u32 state; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);/* poll for hpd connected status every 2ms and timeout after wait_us */ -return readl_poll_timeout (catalog->io.aux.base + +return readl_poll_timeout (msm_dp_catalog->aux_base +REG_DP_DP_HPD_INT_STATUS , state, state &DP_DP_HPD_STATE_STATUS_CONNECTED ,min (wait_us,2000 ), wait_us);
@@ -278,15 +241,13 @@ int msm_dp_catalog_aux_wait_for_hpd_connect_state(struct msm_dp_catalog *msm_dp_u32 msm_dp_catalog_aux_get_irq (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 intr, intr_ack; - intr =msm_dp_read_ahb (catalog,REG_DP_INTR_STATUS ); + intr =msm_dp_read_ahb (msm_dp_catalog,REG_DP_INTR_STATUS ); intr &= ~DP_INTERRUPT_STATUS1_MASK ; intr_ack = (intr &DP_INTERRUPT_STATUS1 ) <<DP_INTERRUPT_STATUS_ACK_SHIFT ; -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS , intr_ack | +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS , intr_ack |DP_INTERRUPT_STATUS1_MASK );return intr;
@@ -298,20 +259,14 @@ void msm_dp_catalog_ctrl_update_transfer_unit(struct msm_dp_catalog *msm_dp_cata u32 msm_dp_tu, u32 valid_boundary, u32 valid_boundary2) { - struct msm_dp_catalog_private *catalog = container_of(msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_link (catalog,REG_DP_VALID_BOUNDARY , valid_boundary); -msm_dp_write_link (catalog,REG_DP_TU , msm_dp_tu); -msm_dp_write_link (catalog,REG_DP_VALID_BOUNDARY_2 , valid_boundary2); +msm_dp_write_link (msm_dp_catalog ,REG_DP_VALID_BOUNDARY ,valid_boundary ); +msm_dp_write_link (msm_dp_catalog,REG_DP_TU , msm_dp_tu); +msm_dp_write_link (msm_dp_catalog,REG_DP_VALID_BOUNDARY_2 , valid_boundary2); }void msm_dp_catalog_ctrl_state_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 state) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , state); +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , state); }void msm_dp_catalog_ctrl_config_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 cfg)
@@ -321,13 +276,11 @@ void msm_dp_catalog_ctrl_config_ctrl(struct msm_dp_catalog *msm_dp_catalog, u32drm_dbg_dp (catalog->drm_dev,"DP_CONFIGURATION_CTRL=0x%x\n" , cfg); -msm_dp_write_link (catalog,REG_DP_CONFIGURATION_CTRL , cfg); +msm_dp_write_link (msm_dp_catalog,REG_DP_CONFIGURATION_CTRL , cfg); }void msm_dp_catalog_ctrl_lane_mapping (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 ln_0 =0 , ln_1 =1 , ln_2 =2 , ln_3 =3 ;/* One-to-One mapping */ u32 ln_mapping;
@@ -336,7 +289,7 @@ void msm_dp_catalog_ctrl_lane_mapping(struct msm_dp_catalog *msm_dp_catalog) ln_mapping |= ln_2 <<LANE2_MAPPING_SHIFT ; ln_mapping |= ln_3 <<LANE3_MAPPING_SHIFT ; -msm_dp_write_link (catalog,REG_DP_LOGICAL2PHYSICAL_LANE_MAPPING , +msm_dp_write_link (msm_dp_catalog,REG_DP_LOGICAL2PHYSICAL_LANE_MAPPING , ln_mapping); }
@@ -344,17 +297,15 @@ void msm_dp_catalog_ctrl_psr_mainlink_enable(struct msm_dp_catalog *msm_dp_catal bool enable) {u32 val; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - val =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + val =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL );if (enable) val |=DP_MAINLINK_CTRL_ENABLE ;else val &= ~DP_MAINLINK_CTRL_ENABLE ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , val); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , val); } void msm_dp_catalog_ctrl_mainlink_ctrl(struct msm_dp_catalog *msm_dp_catalog,
@@ -370,25 +321,25 @@ void msm_dp_catalog_ctrl_mainlink_ctrl(struct msm_dp_catalog *msm_dp_catalog,* To make sure link reg writes happens before other operation, * msm_dp_write_link() function uses writel() */ - mainlink_ctrl =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); mainlink_ctrl &= ~(DP_MAINLINK_CTRL_RESET |DP_MAINLINK_CTRL_ENABLE ); -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); mainlink_ctrl |=DP_MAINLINK_CTRL_RESET ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); mainlink_ctrl &= ~DP_MAINLINK_CTRL_RESET ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); mainlink_ctrl |= (DP_MAINLINK_CTRL_ENABLE |DP_MAINLINK_FB_BOUNDARY_SEL ); -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); }else { - mainlink_ctrl =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); mainlink_ctrl &= ~DP_MAINLINK_CTRL_ENABLE ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); } }
@@ -400,7 +351,7 @@ void msm_dp_catalog_ctrl_config_misc(struct msm_dp_catalog *msm_dp_catalog,struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - misc_val =msm_dp_read_link (catalog,REG_DP_MISC1_MISC0 ); + misc_val =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 );/* clear bpp bits */ misc_val &= ~(0x07 <<DP_MISC0_TEST_BITS_DEPTH_SHIFT );
@@ -410,16 +361,14 @@ void msm_dp_catalog_ctrl_config_misc(struct msm_dp_catalog *msm_dp_catalog, misc_val |=DP_MISC0_SYNCHRONOUS_CLK ;drm_dbg_dp (catalog->drm_dev,"misc settings = 0x%x\n" , misc_val); -msm_dp_write_link (catalog,REG_DP_MISC1_MISC0 , misc_val); +msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc_val); }void msm_dp_catalog_setup_peripheral_flush (struct msm_dp_catalog *msm_dp_catalog) {u32 mainlink_ctrl, hw_revision; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - mainlink_ctrl =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); hw_revision =msm_dp_catalog_hw_revision (msm_dp_catalog);if (hw_revision >=DP_HW_VERSION_1_2 )
@@ -427,7 +376,7 @@ void msm_dp_catalog_setup_peripheral_flush(struct msm_dp_catalog *msm_dp_catalogelse mainlink_ctrl |=DP_MAINLINK_FLUSH_MODE_UPDATE_SDP ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); } void msm_dp_catalog_ctrl_config_msa(struct msm_dp_catalog *msm_dp_catalog,
@@ -485,9 +434,9 @@ void msm_dp_catalog_ctrl_config_msa(struct msm_dp_catalog *msm_dp_catalog, nvid *=3 ;drm_dbg_dp (catalog->drm_dev,"mvid=0x%x, nvid=0x%x\n" , mvid, nvid); -msm_dp_write_link (catalog,REG_DP_SOFTWARE_MVID , mvid); -msm_dp_write_link (catalog,REG_DP_SOFTWARE_NVID , nvid); -msm_dp_write_p0 (catalog,MMSS_DP_DSC_DTO ,0x0 ); +msm_dp_write_link (msm_dp_catalog,REG_DP_SOFTWARE_MVID , mvid); +msm_dp_write_link (msm_dp_catalog,REG_DP_SOFTWARE_NVID , nvid); +msm_dp_write_p0 (msm_dp_catalog,MMSS_DP_DSC_DTO ,0x0 ); } int msm_dp_catalog_ctrl_set_pattern_state_bit(struct msm_dp_catalog *msm_dp_catalog,
@@ -505,7 +454,7 @@ int msm_dp_catalog_ctrl_set_pattern_state_bit(struct msm_dp_catalog *msm_dp_cata bit =BIT (state_bit -1 ) <<DP_MAINLINK_READY_LINK_TRAINING_SHIFT ;/* Poll for mainlink ready status */ - ret =readx_poll_timeout (readl, catalog->io.link.base + + ret =readx_poll_timeout (readl, msm_dp_catalog->link_base +REG_DP_MAINLINK_READY , data, data & bit,POLLING_SLEEP_US ,POLLING_TIMEOUT_US );
@@ -526,10 +475,7 @@ int msm_dp_catalog_ctrl_set_pattern_state_bit(struct msm_dp_catalog *msm_dp_cata*/ u32 msm_dp_catalog_hw_revision (const struct msm_dp_catalog *msm_dp_catalog) { -const struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -return msm_dp_read_ahb (catalog,REG_DP_HW_VERSION ); +return msm_dp_read_ahb (msm_dp_catalog,REG_DP_HW_VERSION ); }/**
@@ -547,28 +493,24 @@ u32 msm_dp_catalog_hw_revision(const struct msm_dp_catalog *msm_dp_catalog)void msm_dp_catalog_ctrl_reset (struct msm_dp_catalog *msm_dp_catalog) {u32 sw_reset; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - sw_reset =msm_dp_read_ahb (catalog,REG_DP_SW_RESET ); + sw_reset =msm_dp_read_ahb (msm_dp_catalog,REG_DP_SW_RESET ); sw_reset |=DP_SW_RESET ; -msm_dp_write_ahb (catalog,REG_DP_SW_RESET , sw_reset); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_SW_RESET , sw_reset);usleep_range (1000 ,1100 );/* h/w recommended delay */ sw_reset &= ~DP_SW_RESET ; -msm_dp_write_ahb (catalog,REG_DP_SW_RESET , sw_reset); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_SW_RESET , sw_reset); }bool msm_dp_catalog_ctrl_mainlink_ready (struct msm_dp_catalog *msm_dp_catalog) {u32 data;int ret; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);/* Poll for mainlink ready status */ - ret =readl_poll_timeout (catalog->io.link.base + + ret =readl_poll_timeout (msm_dp_catalog->link_base +REG_DP_MAINLINK_READY , data, data &DP_MAINLINK_READY_FOR_VIDEO ,POLLING_SLEEP_US ,POLLING_TIMEOUT_US );
@@ -583,17 +525,14 @@ bool msm_dp_catalog_ctrl_mainlink_ready(struct msm_dp_catalog *msm_dp_catalog)void msm_dp_catalog_ctrl_enable_irq (struct msm_dp_catalog *msm_dp_catalog,bool enable) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); -if (enable) { -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS , +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS ,DP_INTERRUPT_STATUS1_MASK ); -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS2 , +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS2 ,DP_INTERRUPT_STATUS2_MASK ); }else { -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS ,0x00 ); -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS2 ,0x00 ); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS ,0x00 ); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS2 ,0x00 ); } }
@@ -603,73 +542,63 @@ void msm_dp_catalog_hpd_config_intr(struct msm_dp_catalog *msm_dp_catalog,struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); -u32 config =msm_dp_read_aux (catalog,REG_DP_DP_HPD_INT_MASK ); +u32 config =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK ); config = (en ? config | intr_mask : config & ~intr_mask);drm_dbg_dp (catalog->drm_dev,"intr_mask=%#x config=%#x\n" , intr_mask, config); -msm_dp_write_aux (catalog,REG_DP_DP_HPD_INT_MASK , +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK , config &DP_DP_HPD_INT_MASK ); }void msm_dp_catalog_ctrl_hpd_enable (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -u32 reftimer =msm_dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); +u32 reftimer =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER );/* Configure REFTIMER and enable it */ reftimer |=DP_DP_HPD_REFTIMER_ENABLE ; -msm_dp_write_aux (catalog,REG_DP_DP_HPD_REFTIMER , reftimer); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER , reftimer);/* Enable HPD */ -msm_dp_write_aux (catalog,REG_DP_DP_HPD_CTRL ,DP_DP_HPD_CTRL_HPD_EN ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_CTRL ,DP_DP_HPD_CTRL_HPD_EN ); }void msm_dp_catalog_ctrl_hpd_disable (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -u32 reftimer =msm_dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); +u32 reftimer =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER ); reftimer &= ~DP_DP_HPD_REFTIMER_ENABLE ; -msm_dp_write_aux (catalog,REG_DP_DP_HPD_REFTIMER , reftimer); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER , reftimer); -msm_dp_write_aux (catalog,REG_DP_DP_HPD_CTRL ,0 ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_CTRL ,0 ); } -static void msm_dp_catalog_enable_sdp (struct msm_dp_catalog_private *catalog) +static void msm_dp_catalog_enable_sdp (struct msm_dp_catalog *msm_dp_catalog) {/* trigger sdp */ -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG3 ,UPDATE_SDP ); -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG3 ,0x0 ); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,UPDATE_SDP ); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x0 ); }void msm_dp_catalog_ctrl_config_psr (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 config;/* enable PSR1 function */ - config =msm_dp_read_link (catalog,REG_PSR_CONFIG ); + config =msm_dp_read_link (msm_dp_catalog,REG_PSR_CONFIG ); config |=PSR1_SUPPORTED ; -msm_dp_write_link (catalog,REG_PSR_CONFIG , config); +msm_dp_write_link (msm_dp_catalog,REG_PSR_CONFIG , config); -msm_dp_write_ahb (catalog,REG_DP_INTR_MASK4 ,DP_INTERRUPT_MASK4 ); -msm_dp_catalog_enable_sdp (catalog); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_MASK4 ,DP_INTERRUPT_MASK4 ); +msm_dp_catalog_enable_sdp (msm_dp_catalog); }void msm_dp_catalog_ctrl_set_psr (struct msm_dp_catalog *msm_dp_catalog,bool enter) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 cmd; - cmd =msm_dp_read_link (catalog,REG_PSR_CMD ); + cmd =msm_dp_read_link (msm_dp_catalog,REG_PSR_CMD ); cmd &= ~(PSR_ENTER |PSR_EXIT );
@@ -678,8 +607,8 @@ void msm_dp_catalog_ctrl_set_psr(struct msm_dp_catalog *msm_dp_catalog, bool entelse cmd |=PSR_EXIT ; -msm_dp_catalog_enable_sdp (catalog); -msm_dp_write_link (catalog,REG_PSR_CMD , cmd); +msm_dp_catalog_enable_sdp (msm_dp_catalog); +msm_dp_write_link (msm_dp_catalog,REG_PSR_CMD , cmd); }u32 msm_dp_catalog_link_is_connected (struct msm_dp_catalog *msm_dp_catalog)
@@ -688,7 +617,7 @@ u32 msm_dp_catalog_link_is_connected(struct msm_dp_catalog *msm_dp_catalog) struct msm_dp_catalog_private, msm_dp_catalog);u32 status; - status =msm_dp_read_aux (catalog,REG_DP_DP_HPD_INT_STATUS ); + status =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_STATUS );drm_dbg_dp (catalog->drm_dev,"aux status: %#x\n" , status); status >>=DP_DP_HPD_STATE_STATUS_BITS_SHIFT ; status &=DP_DP_HPD_STATE_STATUS_BITS_MASK ;
@@ -698,14 +627,12 @@ u32 msm_dp_catalog_link_is_connected(struct msm_dp_catalog *msm_dp_catalog)u32 msm_dp_catalog_hpd_get_intr_status (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);int isr, mask; - isr =msm_dp_read_aux (catalog,REG_DP_DP_HPD_INT_STATUS ); -msm_dp_write_aux (catalog,REG_DP_DP_HPD_INT_ACK , + isr =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_STATUS ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_ACK , (isr &DP_DP_HPD_INT_MASK )); - mask =msm_dp_read_aux (catalog,REG_DP_DP_HPD_INT_MASK ); + mask =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK );/* * We only want to return interrupts that are unmasked to the caller.
@@ -719,29 +646,25 @@ u32 msm_dp_catalog_hpd_get_intr_status(struct msm_dp_catalog *msm_dp_catalog)u32 msm_dp_catalog_ctrl_read_psr_interrupt_status (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 intr, intr_ack; - intr =msm_dp_read_ahb (catalog,REG_DP_INTR_STATUS4 ); + intr =msm_dp_read_ahb (msm_dp_catalog,REG_DP_INTR_STATUS4 ); intr_ack = (intr &DP_INTERRUPT_STATUS4 ) <<DP_INTERRUPT_STATUS_ACK_SHIFT ; -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS4 , intr_ack); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS4 , intr_ack);return intr; }int msm_dp_catalog_ctrl_get_interrupt (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 intr, intr_ack; - intr =msm_dp_read_ahb (catalog,REG_DP_INTR_STATUS2 ); + intr =msm_dp_read_ahb (msm_dp_catalog,REG_DP_INTR_STATUS2 ); intr &= ~DP_INTERRUPT_STATUS2_MASK ; intr_ack = (intr &DP_INTERRUPT_STATUS2 ) <<DP_INTERRUPT_STATUS_ACK_SHIFT ; -msm_dp_write_ahb (catalog,REG_DP_INTR_STATUS2 , +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_STATUS2 , intr_ack |DP_INTERRUPT_STATUS2_MASK );return intr;
@@ -749,13 +672,10 @@ int msm_dp_catalog_ctrl_get_interrupt(struct msm_dp_catalog *msm_dp_catalog)void msm_dp_catalog_ctrl_phy_reset (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -msm_dp_write_ahb (catalog,REG_DP_PHY_CTRL , +msm_dp_write_ahb (msm_dp_catalog,REG_DP_PHY_CTRL ,DP_PHY_CTRL_SW_RESET |DP_PHY_CTRL_SW_RESET_PLL );usleep_range (1000 ,1100 );/* h/w recommended delay */ -msm_dp_write_ahb (catalog,REG_DP_PHY_CTRL ,0x0 ); +msm_dp_write_ahb (msm_dp_catalog,REG_DP_PHY_CTRL ,0x0 ); } void msm_dp_catalog_ctrl_send_phy_pattern(struct msm_dp_catalog *msm_dp_catalog,
@@ -766,66 +686,66 @@ void msm_dp_catalog_ctrl_send_phy_pattern(struct msm_dp_catalog *msm_dp_catalog,u32 value =0x0 ;/* Make sure to clear the current pattern before starting a new one */ -msm_dp_write_link (catalog,REG_DP_STATE_CTRL ,0x0 ); +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,0x0 );drm_dbg_dp (catalog->drm_dev,"pattern: %#x\n" , pattern);switch (pattern) {case DP_PHY_TEST_PATTERN_D10_2 : -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_TRAINING_PATTERN1 );break ;case DP_PHY_TEST_PATTERN_ERROR_COUNT : value &= ~(1 <<16 ); -msm_dp_write_link (catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , +msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , value); value |=SCRAMBLER_RESET_COUNT_VALUE ; -msm_dp_write_link (catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , +msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , value); -msm_dp_write_link (catalog,REG_DP_MAINLINK_LEVELS , +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS ,DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2 ); -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE );break ;case DP_PHY_TEST_PATTERN_PRBS7 : -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_PRBS7 );break ;case DP_PHY_TEST_PATTERN_80BIT_CUSTOM : -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_TEST_CUSTOM_PATTERN );/* 00111110000011111000001111100000 */ -msm_dp_write_link (catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG0 , +msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG0 ,0x3E0F83E0 );/* 00001111100000111110000011111000 */ -msm_dp_write_link (catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG1 , +msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG1 ,0x0F83E0F8 );/* 1111100000111110 */ -msm_dp_write_link (catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG2 , +msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG2 ,0x0000F83E );break ;case DP_PHY_TEST_PATTERN_CP2520 : - value =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + value =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); value &= ~DP_MAINLINK_CTRL_SW_BYPASS_SCRAMBLER ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , value); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , value); value =DP_HBR2_ERM_PATTERN ; -msm_dp_write_link (catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , +msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , value); value |=SCRAMBLER_RESET_COUNT_VALUE ; -msm_dp_write_link (catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , +msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , value); -msm_dp_write_link (catalog,REG_DP_MAINLINK_LEVELS , +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS ,DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2 ); -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE ); - value =msm_dp_read_link (catalog,REG_DP_MAINLINK_CTRL ); + value =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); value |=DP_MAINLINK_CTRL_ENABLE ; -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , value); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , value);break ;case DP_PHY_TEST_PATTERN_SEL_MASK : -msm_dp_write_link (catalog,REG_DP_MAINLINK_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ,DP_MAINLINK_CTRL_ENABLE ); -msm_dp_write_link (catalog,REG_DP_STATE_CTRL , +msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,DP_STATE_CTRL_LINK_TRAINING_PATTERN4 );break ;default :
@@ -837,26 +757,21 @@ void msm_dp_catalog_ctrl_send_phy_pattern(struct msm_dp_catalog *msm_dp_catalog,u32 msm_dp_catalog_ctrl_read_phy_pattern (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -return msm_dp_read_link (catalog,REG_DP_MAINLINK_READY ); +return msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_READY ); }/* panel related catalog functions */ int msm_dp_catalog_panel_timing_cfg (struct msm_dp_catalog *msm_dp_catalog,u32 total,u32 sync_start,u32 width_blanking,u32 msm_dp_active) { -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog);u32 reg; -msm_dp_write_link (catalog,REG_DP_TOTAL_HOR_VER , total); -msm_dp_write_link (catalog,REG_DP_START_HOR_VER_FROM_SYNC , sync_start); -msm_dp_write_link (catalog,REG_DP_HSYNC_VSYNC_WIDTH_POLARITY , width_blanking); -msm_dp_write_link (catalog,REG_DP_ACTIVE_HOR_VER , msm_dp_active); +msm_dp_write_link (msm_dp_catalog,REG_DP_TOTAL_HOR_VER , total); +msm_dp_write_link (msm_dp_catalog,REG_DP_START_HOR_VER_FROM_SYNC , sync_start); +msm_dp_write_link (msm_dp_catalog,REG_DP_HSYNC_VSYNC_WIDTH_POLARITY , width_blanking); +msm_dp_write_link (msm_dp_catalog,REG_DP_ACTIVE_HOR_VER , msm_dp_active); - reg =msm_dp_read_p0 (catalog,MMSS_DP_INTF_CONFIG ); + reg =msm_dp_read_p0 (msm_dp_catalog,MMSS_DP_INTF_CONFIG );if (msm_dp_catalog->wide_bus_en) reg |=DP_INTF_CONFIG_DATABUS_WIDEN ;
@@ -866,42 +781,36 @@ int msm_dp_catalog_panel_timing_cfg(struct msm_dp_catalog *msm_dp_catalog, u32 tDRM_DEBUG_DP ("wide_bus_en=%d reg=%#x\n" , msm_dp_catalog->wide_bus_en, reg); -msm_dp_write_p0 (catalog,MMSS_DP_INTF_CONFIG , reg); +msm_dp_write_p0 (msm_dp_catalog,MMSS_DP_INTF_CONFIG , reg);return 0 ; }static void msm_dp_catalog_panel_send_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp) { -struct msm_dp_catalog_private *catalog;u32 header[2 ];u32 val;int i; - catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); -msm_dp_utils_pack_sdp_header (&vsc_sdp->sdp_header, header); -msm_dp_write_link (catalog,MMSS_DP_GENERIC0_0 , header[0 ]); -msm_dp_write_link (catalog,MMSS_DP_GENERIC0_1 , header[1 ]); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_0 , header[0 ]); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_1 , header[1 ]);for (i =0 ; i <sizeof (vsc_sdp->db); i +=4 ) { val = ((vsc_sdp->db[i]) | (vsc_sdp->db[i +1 ] <<8 ) | (vsc_sdp->db[i +2 ] <<16 ) | (vsc_sdp->db[i +3 ] <<24 )); -msm_dp_write_link (catalog,MMSS_DP_GENERIC0_2 + i, val); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_2 + i, val); } }static void msm_dp_catalog_panel_update_sdp (struct msm_dp_catalog *msm_dp_catalog) { -struct msm_dp_catalog_private *catalog;u32 hw_revision; - catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - hw_revision =msm_dp_catalog_hw_revision (msm_dp_catalog);if (hw_revision <DP_HW_VERSION_1_2 && hw_revision >=DP_HW_VERSION_1_0 ) { -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG3 ,0x01 ); -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG3 ,0x00 ); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x01 ); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x00 ); } }
@@ -912,15 +821,15 @@ void msm_dp_catalog_panel_enable_vsc_sdp(struct msm_dp_catalog *msm_dp_catalog, catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - cfg =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG ); - cfg2 =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG2 ); - misc =msm_dp_read_link (catalog,REG_DP_MISC1_MISC0 ); + cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG ); + cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 ); + misc =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 ); cfg |=GEN0_SDP_EN ; -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG , cfg); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , cfg); cfg2 |=GENERIC0_SDPSIZE_VALID ; -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG2 , cfg2); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , cfg2);msm_dp_catalog_panel_send_vsc_sdp (msm_dp_catalog, vsc_sdp);
@@ -930,7 +839,7 @@ void msm_dp_catalog_panel_enable_vsc_sdp(struct msm_dp_catalog *msm_dp_catalog,drm_dbg_dp (catalog->drm_dev,"vsc sdp enable=1\n" );pr_debug ("misc settings = 0x%x\n" , misc); -msm_dp_write_link (catalog,REG_DP_MISC1_MISC0 , misc); +msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc);msm_dp_catalog_panel_update_sdp (msm_dp_catalog); }
@@ -942,15 +851,15 @@ void msm_dp_catalog_panel_disable_vsc_sdp(struct msm_dp_catalog *msm_dp_catalog) catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - cfg =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG ); - cfg2 =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG2 ); - misc =msm_dp_read_link (catalog,REG_DP_MISC1_MISC0 ); + cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG ); + cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 ); + misc =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 ); cfg &= ~GEN0_SDP_EN ; -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG , cfg); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , cfg); cfg2 &= ~GENERIC0_SDPSIZE_VALID ; -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG2 , cfg2); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , cfg2);/* switch back to MSA */ misc &= ~DP_MISC1_VSC_SDP ;
@@ -958,7 +867,7 @@ void msm_dp_catalog_panel_disable_vsc_sdp(struct msm_dp_catalog *msm_dp_catalog)drm_dbg_dp (catalog->drm_dev,"vsc sdp enable=0\n" );pr_debug ("misc settings = 0x%x\n" , misc); -msm_dp_write_link (catalog,REG_DP_MISC1_MISC0 , misc); +msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc);msm_dp_catalog_panel_update_sdp (msm_dp_catalog); }
@@ -977,15 +886,15 @@ static void __iomem *msm_dp_ioremap(struct platform_device *pdev, int idx, size_static int msm_dp_catalog_get_io (struct msm_dp_catalog_private *catalog) { +struct msm_dp_catalog *msm_dp_catalog = &catalog->msm_dp_catalog;struct platform_device *pdev =to_platform_device (catalog->dev); -struct dss_io_data *dss = &catalog->io; - dss->ahb.base =msm_dp_ioremap (pdev,0 , &dss->ahb.len); -if (IS_ERR (dss->ahb.base)) -return PTR_ERR (dss->ahb.base); + msm_dp_catalog->ahb_base =msm_dp_ioremap (pdev,0 , &msm_dp_catalog->ahb_len); +if (IS_ERR (msm_dp_catalog->ahb_base)) +return PTR_ERR (msm_dp_catalog->ahb_base); - dss->aux.base =msm_dp_ioremap (pdev,1 , &dss->aux.len); -if (IS_ERR (dss->aux.base)) { + msm_dp_catalog->aux_base =msm_dp_ioremap (pdev,1 , &msm_dp_catalog->aux_len); +if (IS_ERR (msm_dp_catalog->aux_base)) {/* * The initial binding had a single reg, but in order to * support variation in the sub-region sizes this was split.
@@ -993,34 +902,34 @@ static int msm_dp_catalog_get_io(struct msm_dp_catalog_private *catalog)* reg is specified, so fill in the sub-region offsets and * lengths based on this single region. */ -if (PTR_ERR (dss->aux.base) == -EINVAL ) { -if (dss->ahb.len <DP_DEFAULT_P0_OFFSET +DP_DEFAULT_P0_SIZE ) { +if (PTR_ERR (msm_dp_catalog->aux_base) == -EINVAL ) { +if (msm_dp_catalog->ahb_len <DP_DEFAULT_P0_OFFSET +DP_DEFAULT_P0_SIZE ) {DRM_ERROR ("legacy memory region not large enough\n" );return -EINVAL ; } - dss->ahb.len =DP_DEFAULT_AHB_SIZE ; - dss->aux.base = dss->ahb.base +DP_DEFAULT_AUX_OFFSET ; - dss->aux.len =DP_DEFAULT_AUX_SIZE ; - dss->link.base = dss->ahb.base +DP_DEFAULT_LINK_OFFSET ; - dss->link.len =DP_DEFAULT_LINK_SIZE ; - dss->p0.base = dss->ahb.base +DP_DEFAULT_P0_OFFSET ; - dss->p0.len =DP_DEFAULT_P0_SIZE ; + msm_dp_catalog->ahb_len =DP_DEFAULT_AHB_SIZE ; + msm_dp_catalog->aux_base = msm_dp_catalog->ahb_base +DP_DEFAULT_AUX_OFFSET ; + msm_dp_catalog->aux_len =DP_DEFAULT_AUX_SIZE ; + msm_dp_catalog->link_base = msm_dp_catalog->ahb_base +DP_DEFAULT_LINK_OFFSET ; + msm_dp_catalog->link_len =DP_DEFAULT_LINK_SIZE ; + msm_dp_catalog->p0_base = msm_dp_catalog->ahb_base +DP_DEFAULT_P0_OFFSET ; + msm_dp_catalog->p0_len =DP_DEFAULT_P0_SIZE ; }else { -DRM_ERROR ("unable to remap aux region: %pe\n" , dss->aux.base); -return PTR_ERR (dss->aux.base); +DRM_ERROR ("unable to remap aux region: %pe\n" , msm_dp_catalog->aux_base); +return PTR_ERR (msm_dp_catalog->aux_base); } }else { - dss->link.base =msm_dp_ioremap (pdev,2 , &dss->link.len); -if (IS_ERR (dss->link.base)) { -DRM_ERROR ("unable to remap link region: %pe\n" , dss->link.base); -return PTR_ERR (dss->link.base); + msm_dp_catalog->link_base =msm_dp_ioremap (pdev,2 , &msm_dp_catalog->link_len); +if (IS_ERR (msm_dp_catalog->link_base)) { +DRM_ERROR ("unable to remap link region: %pe\n" , msm_dp_catalog->link_base); +return PTR_ERR (msm_dp_catalog->link_base); } - dss->p0.base =msm_dp_ioremap (pdev,3 , &dss->p0.len); -if (IS_ERR (dss->p0.base)) { -DRM_ERROR ("unable to remap p0 region: %pe\n" , dss->p0.base); -return PTR_ERR (dss->p0.base); + msm_dp_catalog->p0_base =msm_dp_ioremap (pdev,3 , &msm_dp_catalog->p0_len); +if (IS_ERR (msm_dp_catalog->p0_base)) { +DRM_ERROR ("unable to remap p0 region: %pe\n" , msm_dp_catalog->p0_base); +return PTR_ERR (msm_dp_catalog->p0_base); } }
@@ -1057,7 +966,7 @@ u32 msm_dp_catalog_audio_get_header(struct msm_dp_catalog *msm_dp_catalog, sdp_map = catalog->audio_map; -return msm_dp_read_link (catalog, sdp_map[sdp][header]); +return msm_dp_read_link (msm_dp_catalog, sdp_map[sdp][header]); } void msm_dp_catalog_audio_set_header(struct msm_dp_catalog *msm_dp_catalog,
@@ -1076,7 +985,7 @@ void msm_dp_catalog_audio_set_header(struct msm_dp_catalog *msm_dp_catalog, sdp_map = catalog->audio_map; -msm_dp_write_link (catalog, sdp_map[sdp][header], data); +msm_dp_write_link (msm_dp_catalog, sdp_map[sdp][header], data); }void msm_dp_catalog_audio_config_acr (struct msm_dp_catalog *msm_dp_catalog,u32 select)
@@ -1095,7 +1004,7 @@ void msm_dp_catalog_audio_config_acr(struct msm_dp_catalog *msm_dp_catalog, u32drm_dbg_dp (catalog->drm_dev,"select: %#x, acr_ctrl: %#x\n" , select, acr_ctrl); -msm_dp_write_link (catalog,MMSS_DP_AUDIO_ACR_CTRL , acr_ctrl); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_AUDIO_ACR_CTRL , acr_ctrl); }void msm_dp_catalog_audio_enable (struct msm_dp_catalog *msm_dp_catalog,bool enable)
@@ -1109,7 +1018,7 @@ void msm_dp_catalog_audio_enable(struct msm_dp_catalog *msm_dp_catalog, bool ena catalog =container_of (msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - audio_ctrl =msm_dp_read_link (catalog,MMSS_DP_AUDIO_CFG ); + audio_ctrl =msm_dp_read_link (msm_dp_catalog,MMSS_DP_AUDIO_CFG );if (enable) audio_ctrl |=BIT (0 );
@@ -1118,7 +1027,7 @@ void msm_dp_catalog_audio_enable(struct msm_dp_catalog *msm_dp_catalog, bool enadrm_dbg_dp (catalog->drm_dev,"dp_audio_cfg = 0x%x\n" , audio_ctrl); -msm_dp_write_link (catalog,MMSS_DP_AUDIO_CFG , audio_ctrl); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_AUDIO_CFG , audio_ctrl);/* make sure audio engine is disabled */ wmb (); }
@@ -1135,7 +1044,7 @@ void msm_dp_catalog_audio_config_sdp(struct msm_dp_catalog *msm_dp_catalog) catalog =container_of (msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - sdp_cfg =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG ); + sdp_cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG );/* AUDIO_TIMESTAMP_SDP_EN */ sdp_cfg |=BIT (1 );/* AUDIO_STREAM_SDP_EN */
@@ -1149,9 +1058,9 @@ void msm_dp_catalog_audio_config_sdp(struct msm_dp_catalog *msm_dp_catalog)drm_dbg_dp (catalog->drm_dev,"sdp_cfg = 0x%x\n" , sdp_cfg); -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG , sdp_cfg); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , sdp_cfg); - sdp_cfg2 =msm_dp_read_link (catalog,MMSS_DP_SDP_CFG2 ); + sdp_cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 );/* IFRM_REGSRC -> Do not use reg values */ sdp_cfg2 &= ~BIT (0 );/* AUDIO_STREAM_HB3_REGSRC-> Do not use reg values */
@@ -1159,7 +1068,7 @@ void msm_dp_catalog_audio_config_sdp(struct msm_dp_catalog *msm_dp_catalog)drm_dbg_dp (catalog->drm_dev,"sdp_cfg2 = 0x%x\n" , sdp_cfg2); -msm_dp_write_link (catalog,MMSS_DP_SDP_CFG2 , sdp_cfg2); +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , sdp_cfg2); }void msm_dp_catalog_audio_init (struct msm_dp_catalog *msm_dp_catalog)
@@ -1214,7 +1123,7 @@ void msm_dp_catalog_audio_sfe_level(struct msm_dp_catalog *msm_dp_catalog, u32 s catalog =container_of (msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - mainlink_levels =msm_dp_read_link (catalog,REG_DP_MAINLINK_LEVELS ); + mainlink_levels =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS ); mainlink_levels &=0xFE0 ; mainlink_levels |= safe_to_exit_level;
@@ -1222,5 +1131,5 @@ void msm_dp_catalog_audio_sfe_level(struct msm_dp_catalog *msm_dp_catalog, u32 s"mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n" , mainlink_levels, safe_to_exit_level); -msm_dp_write_link (catalog,REG_DP_MAINLINK_LEVELS , mainlink_levels); +msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS , mainlink_levels); }
drivers/gpu/drm/msm/dp/dp_catalog.h +12 -0
@@ -49,6 +49,18 @@ enum msm_dp_catalog_audio_header_type {struct msm_dp_catalog {bool wide_bus_en; + +void __iomem *ahb_base; +size_t ahb_len; + +void __iomem *aux_base; +size_t aux_len; + +void __iomem *link_base; +size_t link_len; + +void __iomem *p0_base; +size_t p0_len; };/* Debug module */
Signature · 1 line
2.39.5
PATCH 5/14 drm/msm/dp: move I/O functions to global header
In reply to Dmitry BaryshkovMove msm_dp_read()/msm_write_foo() functions to the dp_catalog.h, allowing other modules to access the data directly.
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 65 ------------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 65 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -65
@@ -78,71 +78,6 @@ void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_dmsm_disp_snapshot_add_block (disp_state, 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 +66 -0
72 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH 6/14 drm/msm/dp: move/inline AUX register functions
In reply to Dmitry BaryshkovMove all register-level functions to dp_aux.c, inlining one line wrappers during this process.
--- drivers/gpu/drm/msm/dp/dp_aux.c | 98 +++++++++++++++++++++++++++++++------ drivers/gpu/drm/msm/dp/dp_catalog.c | 96 ------------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 9 ---- 3 files changed, 84 insertions(+), 119 deletions(-)
drivers/gpu/drm/msm/dp/dp_aux.c +84 -14
@@ -4,6 +4,7 @@*/ #include <linux/delay.h> +#include <linux/iopoll.h> #include <linux/phy/phy.h> #include <drm/drm_print.h>
@@ -45,6 +46,73 @@ struct msm_dp_aux_private {struct drm_dp_aux msm_dp_aux; }; +static int msm_dp_aux_clear_hw_interrupts (struct msm_dp_aux_private *aux) +{ +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; + +msm_dp_read_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_STATUS ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x1f ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0x9f ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_PHY_AUX_INTERRUPT_CLEAR ,0 ); + +return 0 ; +} + +/* +* NOTE: resetting AUX controller will also clear any pending HPD related interrupts +*/ +static void msm_dp_aux_reset (struct msm_dp_aux_private *aux) +{ +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 aux_ctrl; + + aux_ctrl =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_CTRL ); + + aux_ctrl |=DP_AUX_CTRL_RESET ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); +usleep_range (1000 ,1100 );/* h/w recommended delay */ + + aux_ctrl &= ~DP_AUX_CTRL_RESET ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); +} + +static void msm_dp_aux_enable (struct msm_dp_aux_private *aux) +{ +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 aux_ctrl; + + aux_ctrl =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_CTRL ); + +msm_dp_write_aux (msm_dp_catalog,REG_DP_TIMEOUT_COUNT ,0xffff ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_LIMITS ,0xffff ); + + aux_ctrl |=DP_AUX_CTRL_ENABLE ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); +} + +static void msm_dp_aux_disable (struct msm_dp_aux_private *aux) +{ +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 aux_ctrl; + + aux_ctrl =msm_dp_read_aux (msm_dp_catalog,REG_DP_AUX_CTRL ); + aux_ctrl &= ~DP_AUX_CTRL_ENABLE ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_AUX_CTRL , aux_ctrl); +} + +static int msm_dp_aux_wait_for_hpd_connect_state (struct msm_dp_aux_private *aux, +unsigned long wait_us) +{ +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 state; + +/* poll for hpd connected status every 2ms and timeout after wait_us */ +return readl_poll_timeout (msm_dp_catalog->aux_base + +REG_DP_DP_HPD_INT_STATUS , + state, state &DP_DP_HPD_STATE_STATUS_CONNECTED , +min (wait_us,2000 ), wait_us); +} +#define MAX_AUX_RETRIES 5 static ssize_t msm_dp_aux_write(struct msm_dp_aux_private *aux,
@@ -88,11 +156,11 @@ static ssize_t msm_dp_aux_write(struct msm_dp_aux_private *aux,/* index = 0, write */ if (i ==0 ) reg |=DP_AUX_DATA_INDEX_WRITE ; -msm_dp_catalog_aux_write_data (aux->catalog, reg); +msm_dp_write_aux (aux->catalog,REG_DP_AUX_DATA , reg); } -msm_dp_catalog_aux_clear_trans (aux->catalog, false); -msm_dp_catalog_aux_clear_hw_interrupts (aux->catalog); +msm_dp_write_aux (aux->catalog,REG_DP_AUX_TRANS_CTRL ,0 ); +msm_dp_aux_clear_hw_interrupts (aux); reg =0 ;/* Transaction number == 1 */ if (!aux->native) {/* i2c */
@@ -106,7 +174,7 @@ static ssize_t msm_dp_aux_write(struct msm_dp_aux_private *aux, } reg |=DP_AUX_TRANS_CTRL_GO ; -msm_dp_catalog_aux_write_trans (aux->catalog, reg); +msm_dp_write_aux (aux->catalog,REG_DP_AUX_TRANS_CTRL , reg);return len; }
@@ -139,20 +207,22 @@ static ssize_t msm_dp_aux_cmd_fifo_rx(struct msm_dp_aux_private *aux,u32 i, actual_i;u32 len = msg->size; -msm_dp_catalog_aux_clear_trans (aux->catalog, true); + data =msm_dp_read_aux (aux->catalog,REG_DP_AUX_TRANS_CTRL ); + data &= ~DP_AUX_TRANS_CTRL_GO ; +msm_dp_write_aux (aux->catalog,REG_DP_AUX_TRANS_CTRL , data); data =DP_AUX_DATA_INDEX_WRITE ;/* INDEX_WRITE */ data |=DP_AUX_DATA_READ ;/* read */ -msm_dp_catalog_aux_write_data (aux->catalog, data); +msm_dp_write_aux (aux->catalog,REG_DP_AUX_DATA , data); dp = msg->buffer;/* discard first byte */ - data =msm_dp_catalog_aux_read_data (aux->catalog); + data =msm_dp_read_aux (aux->catalog,REG_DP_AUX_DATA );for (i =0 ; i < len; i++) { - data =msm_dp_catalog_aux_read_data (aux->catalog); + data =msm_dp_read_aux (aux->catalog,REG_DP_AUX_DATA ); *dp++ = (u8)((data >>DP_AUX_DATA_OFFSET ) &0xff ); actual_i = (data >>DP_AUX_DATA_INDEX_OFFSET ) &0xFF ;
@@ -336,7 +406,7 @@ static ssize_t msm_dp_aux_transfer(struct drm_dp_aux *msm_dp_aux, }/* reset aux if link is in connected state */ if (msm_dp_catalog_link_is_connected (aux->catalog)) -msm_dp_catalog_aux_reset (aux->catalog); +msm_dp_aux_reset (aux); }else { aux->retry_cnt =0 ;switch (aux->aux_error_num) {
@@ -403,7 +473,7 @@ irqreturn_t msm_dp_aux_isr(struct drm_dp_aux *msm_dp_aux)if (isr &DP_INTR_AUX_ERROR ) { aux->aux_error_num =DP_AUX_ERR_PHY ; -msm_dp_catalog_aux_clear_hw_interrupts (aux->catalog); +msm_dp_aux_clear_hw_interrupts (aux); }else if (isr &DP_INTR_NACK_DEFER ) { aux->aux_error_num =DP_AUX_ERR_NACK_DEFER ; }else if (isr &DP_INTR_WRONG_ADDR ) {
@@ -444,7 +514,7 @@ void msm_dp_aux_reconfig(struct drm_dp_aux *msm_dp_aux) aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux);phy_calibrate (aux->phy); -msm_dp_catalog_aux_reset (aux->catalog); +msm_dp_aux_reset (aux); }void msm_dp_aux_init (struct drm_dp_aux *msm_dp_aux)
@@ -460,7 +530,7 @@ void msm_dp_aux_init(struct drm_dp_aux *msm_dp_aux)mutex_lock (&aux->mutex); -msm_dp_catalog_aux_enable (aux->catalog, true); +msm_dp_aux_enable (aux); aux->retry_cnt =0 ; aux->initted = true;
@@ -476,7 +546,7 @@ void msm_dp_aux_deinit(struct drm_dp_aux *msm_dp_aux)mutex_lock (&aux->mutex); aux->initted = false; -msm_dp_catalog_aux_enable (aux->catalog, false); +msm_dp_aux_disable (aux);mutex_unlock (&aux->mutex); }
@@ -517,7 +587,7 @@ static int msm_dp_wait_hpd_asserted(struct drm_dp_aux *msm_dp_aux,if (ret)return ret; - ret =msm_dp_catalog_aux_wait_for_hpd_connect_state (aux->catalog, wait_us); + ret =msm_dp_aux_wait_for_hpd_connect_state (aux, wait_us);pm_runtime_put_sync (aux->dev);return ret;
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -96
102 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -9
@@ -133,15 +133,6 @@ static inline void msm_dp_write_link(struct msm_dp_catalog *msm_dp_catalog,void msm_dp_catalog_snapshot (struct msm_dp_catalog *msm_dp_catalog,struct msm_disp_state *disp_state);/* AUX APIs */ -u32 msm_dp_catalog_aux_read_data (struct msm_dp_catalog *msm_dp_catalog); -int msm_dp_catalog_aux_write_data (struct msm_dp_catalog *msm_dp_catalog,u32 data); -int msm_dp_catalog_aux_write_trans (struct msm_dp_catalog *msm_dp_catalog,u32 data); -int msm_dp_catalog_aux_clear_trans (struct msm_dp_catalog *msm_dp_catalog,bool read); -int msm_dp_catalog_aux_clear_hw_interrupts (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_aux_reset (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_aux_enable (struct msm_dp_catalog *msm_dp_catalog,bool enable); -int msm_dp_catalog_aux_wait_for_hpd_connect_state (struct msm_dp_catalog *msm_dp_catalog, -unsigned long wait_us);u32 msm_dp_catalog_aux_get_irq (struct msm_dp_catalog *msm_dp_catalog);/* DP Controller APIs */
Signature · 1 line
2.39.5
PATCH 7/14 drm/msm/dp: move/inline ctrl register functions
In reply to Dmitry BaryshkovMove CTRL-related functions to dp_ctrl.c, inlining one line wrappers during this process. The enable/disable functions have been split to the enable/disable or enter/exit pairs. The IRQ and HPD related functions are left in dp_catalog.c, pending later cleanup.
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 389 +------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 22 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 447 ++++++++++++++++++++++++++++++++---- 3 files changed, 409 insertions(+), 449 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +5 -384
@@ -18,8 +18,6 @@#define POLLING_SLEEP_US 1000#define POLLING_TIMEOUT_US 10000 -#define SCRAMBLER_RESET_COUNT_VALUE 0xFC -#define DP_INTERRUPT_STATUS_ACK_SHIFT 1#define DP_INTERRUPT_STATUS_MASK_SHIFT 2
@@ -93,217 +91,6 @@ u32 msm_dp_catalog_aux_get_irq(struct msm_dp_catalog *msm_dp_catalog) } -/* controller related catalog functions */ -void msm_dp_catalog_ctrl_update_transfer_unit (struct msm_dp_catalog *msm_dp_catalog, -u32 msm_dp_tu,u32 valid_boundary, -u32 valid_boundary2) -{ -msm_dp_write_link (msm_dp_catalog,REG_DP_VALID_BOUNDARY , valid_boundary); -msm_dp_write_link (msm_dp_catalog,REG_DP_TU , msm_dp_tu); -msm_dp_write_link (msm_dp_catalog,REG_DP_VALID_BOUNDARY_2 , valid_boundary2); -} - -void msm_dp_catalog_ctrl_state_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 state) -{ -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , state); -} - -void msm_dp_catalog_ctrl_config_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 cfg) -{ -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -drm_dbg_dp (catalog->drm_dev,"DP_CONFIGURATION_CTRL=0x%x\n" , cfg); - -msm_dp_write_link (msm_dp_catalog,REG_DP_CONFIGURATION_CTRL , cfg); -} - -void msm_dp_catalog_ctrl_lane_mapping (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 ln_0 =0 , ln_1 =1 , ln_2 =2 , ln_3 =3 ;/* One-to-One mapping */ -u32 ln_mapping; - - ln_mapping = ln_0 <<LANE0_MAPPING_SHIFT ; - ln_mapping |= ln_1 <<LANE1_MAPPING_SHIFT ; - ln_mapping |= ln_2 <<LANE2_MAPPING_SHIFT ; - ln_mapping |= ln_3 <<LANE3_MAPPING_SHIFT ; - -msm_dp_write_link (msm_dp_catalog,REG_DP_LOGICAL2PHYSICAL_LANE_MAPPING , - ln_mapping); -} - -void msm_dp_catalog_ctrl_psr_mainlink_enable (struct msm_dp_catalog *msm_dp_catalog, -bool enable) -{ -u32 val; - - val =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - -if (enable) - val |=DP_MAINLINK_CTRL_ENABLE ; -else - val &= ~DP_MAINLINK_CTRL_ENABLE ; - -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , val); -} - -void msm_dp_catalog_ctrl_mainlink_ctrl (struct msm_dp_catalog *msm_dp_catalog, -bool enable) -{ -u32 mainlink_ctrl; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -drm_dbg_dp (catalog->drm_dev,"enable=%d\n" , enable); -if (enable) { -/* -* To make sure link reg writes happens before other operation, -* msm_dp_write_link() function uses writel() -*/ - mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - - mainlink_ctrl &= ~(DP_MAINLINK_CTRL_RESET | -DP_MAINLINK_CTRL_ENABLE ); -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); - - mainlink_ctrl |=DP_MAINLINK_CTRL_RESET ; -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); - - mainlink_ctrl &= ~DP_MAINLINK_CTRL_RESET ; -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); - - mainlink_ctrl |= (DP_MAINLINK_CTRL_ENABLE | -DP_MAINLINK_FB_BOUNDARY_SEL ); -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); - }else { - mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - mainlink_ctrl &= ~DP_MAINLINK_CTRL_ENABLE ; -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); - } -} - -void msm_dp_catalog_ctrl_config_misc (struct msm_dp_catalog *msm_dp_catalog, -u32 colorimetry_cfg, -u32 test_bits_depth) -{ -u32 misc_val; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - - misc_val =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 ); - -/* clear bpp bits */ - misc_val &= ~(0x07 <<DP_MISC0_TEST_BITS_DEPTH_SHIFT ); - misc_val |= colorimetry_cfg <<DP_MISC0_COLORIMETRY_CFG_SHIFT ; - misc_val |= test_bits_depth <<DP_MISC0_TEST_BITS_DEPTH_SHIFT ; -/* Configure clock to synchronous mode */ - misc_val |=DP_MISC0_SYNCHRONOUS_CLK ; - -drm_dbg_dp (catalog->drm_dev,"misc settings = 0x%x\n" , misc_val); -msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc_val); -} - -void msm_dp_catalog_setup_peripheral_flush (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 mainlink_ctrl, hw_revision; - - mainlink_ctrl =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - - hw_revision =msm_dp_catalog_hw_revision (msm_dp_catalog); -if (hw_revision >=DP_HW_VERSION_1_2 ) - mainlink_ctrl |=DP_MAINLINK_FLUSH_MODE_SDE_PERIPH_UPDATE ; -else - mainlink_ctrl |=DP_MAINLINK_FLUSH_MODE_UPDATE_SDP ; - -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , mainlink_ctrl); -} - -void msm_dp_catalog_ctrl_config_msa (struct msm_dp_catalog *msm_dp_catalog, -u32 rate,u32 stream_rate_khz, -bool is_ycbcr_420) -{ -u32 pixel_m, pixel_n; -u32 mvid, nvid, pixel_div =0 , dispcc_input_rate; -u32 const nvid_fixed =DP_LINK_CONSTANT_N_VALUE ; -u32 const link_rate_hbr2 =540000 ; -u32 const link_rate_hbr3 =810000 ; -unsigned long den, num; - -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - -if (rate == link_rate_hbr3) - pixel_div =6 ; -else if (rate ==162000 || rate ==270000 ) - pixel_div =2 ; -else if (rate == link_rate_hbr2) - pixel_div =4 ; -else -DRM_ERROR ("Invalid pixel mux divider\n" ); - - dispcc_input_rate = (rate *10 ) / pixel_div; - -rational_best_approximation (dispcc_input_rate, stream_rate_khz, - (unsigned long )(1 <<16 ) -1 , - (unsigned long )(1 <<16 ) -1 , &den, &num); - - den = ~(den - num); - den = den &0xFFFF ; - pixel_m = num; - pixel_n = den; - - mvid = (pixel_m &0xFFFF ) *5 ; - nvid = (0xFFFF & (~pixel_n)) + (pixel_m &0xFFFF ); - -if (nvid < nvid_fixed) { -u32 temp; - - temp = (nvid_fixed / nvid) * nvid; - mvid = (nvid_fixed / nvid) * mvid; - nvid = temp; - } - -if (is_ycbcr_420) - mvid /=2 ; - -if (link_rate_hbr2 == rate) - nvid *=2 ; - -if (link_rate_hbr3 == rate) - nvid *=3 ; - -drm_dbg_dp (catalog->drm_dev,"mvid=0x%x, nvid=0x%x\n" , mvid, nvid); -msm_dp_write_link (msm_dp_catalog,REG_DP_SOFTWARE_MVID , mvid); -msm_dp_write_link (msm_dp_catalog,REG_DP_SOFTWARE_NVID , nvid); -msm_dp_write_p0 (msm_dp_catalog,MMSS_DP_DSC_DTO ,0x0 ); -} - -int msm_dp_catalog_ctrl_set_pattern_state_bit (struct msm_dp_catalog *msm_dp_catalog, -u32 state_bit) -{ -int bit, ret; -u32 data; -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); - - bit =BIT (state_bit -1 ); -drm_dbg_dp (catalog->drm_dev,"hw: bit=%d train=%d\n" , bit, state_bit); -msm_dp_catalog_ctrl_state_ctrl (msm_dp_catalog, bit); - - bit =BIT (state_bit -1 ) <<DP_MAINLINK_READY_LINK_TRAINING_SHIFT ; - -/* Poll for mainlink ready status */ - ret =readx_poll_timeout (readl, msm_dp_catalog->link_base + -REG_DP_MAINLINK_READY , - data, data & bit, -POLLING_SLEEP_US ,POLLING_TIMEOUT_US ); -if (ret <0 ) { -DRM_ERROR ("set state_bit for link_train=%d failed\n" , state_bit); -return ret; - } -return 0 ; -} -/** * msm_dp_catalog_hw_revision() - retrieve DP hw revision *
@@ -317,50 +104,6 @@ u32 msm_dp_catalog_hw_revision(const struct msm_dp_catalog *msm_dp_catalog)return msm_dp_read_ahb (msm_dp_catalog,REG_DP_HW_VERSION ); } -/** -* msm_dp_catalog_ctrl_reset() - reset DP controller -* -* @msm_dp_catalog: DP catalog structure -* -* return: void -* -* This function reset the DP controller -* -* NOTE: reset DP controller will also clear any pending HPD related interrupts -* -*/ -void msm_dp_catalog_ctrl_reset (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 sw_reset; - - sw_reset =msm_dp_read_ahb (msm_dp_catalog,REG_DP_SW_RESET ); - - sw_reset |=DP_SW_RESET ; -msm_dp_write_ahb (msm_dp_catalog,REG_DP_SW_RESET , sw_reset); -usleep_range (1000 ,1100 );/* h/w recommended delay */ - - sw_reset &= ~DP_SW_RESET ; -msm_dp_write_ahb (msm_dp_catalog,REG_DP_SW_RESET , sw_reset); -} - -bool msm_dp_catalog_ctrl_mainlink_ready (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 data; -int ret; - -/* Poll for mainlink ready status */ - ret =readl_poll_timeout (msm_dp_catalog->link_base + -REG_DP_MAINLINK_READY , - data, data &DP_MAINLINK_READY_FOR_VIDEO , -POLLING_SLEEP_US ,POLLING_TIMEOUT_US ); -if (ret <0 ) { -DRM_ERROR ("mainlink not ready\n" ); -return false; - } - -return true; -} -void msm_dp_catalog_ctrl_enable_irq (struct msm_dp_catalog *msm_dp_catalog,bool enable) {
@@ -413,43 +156,6 @@ void msm_dp_catalog_ctrl_hpd_disable(struct msm_dp_catalog *msm_dp_catalog)msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_CTRL ,0 ); } -static void msm_dp_catalog_enable_sdp (struct msm_dp_catalog *msm_dp_catalog) -{ -/* trigger sdp */ -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,UPDATE_SDP ); -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x0 ); -} - -void msm_dp_catalog_ctrl_config_psr (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 config; - -/* enable PSR1 function */ - config =msm_dp_read_link (msm_dp_catalog,REG_PSR_CONFIG ); - config |=PSR1_SUPPORTED ; -msm_dp_write_link (msm_dp_catalog,REG_PSR_CONFIG , config); - -msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_MASK4 ,DP_INTERRUPT_MASK4 ); -msm_dp_catalog_enable_sdp (msm_dp_catalog); -} - -void msm_dp_catalog_ctrl_set_psr (struct msm_dp_catalog *msm_dp_catalog,bool enter) -{ -u32 cmd; - - cmd =msm_dp_read_link (msm_dp_catalog,REG_PSR_CMD ); - - cmd &= ~(PSR_ENTER |PSR_EXIT ); - -if (enter) - cmd |=PSR_ENTER ; -else - cmd |=PSR_EXIT ; - -msm_dp_catalog_enable_sdp (msm_dp_catalog); -msm_dp_write_link (msm_dp_catalog,REG_PSR_CMD , cmd); -} -u32 msm_dp_catalog_link_is_connected (struct msm_dp_catalog *msm_dp_catalog) { struct msm_dp_catalog_private *catalog = container_of(msm_dp_catalog,
@@ -495,6 +201,11 @@ u32 msm_dp_catalog_ctrl_read_psr_interrupt_status(struct msm_dp_catalog *msm_dp_return intr; } +void msm_dp_catalog_ctrl_config_psr_interrupt (struct msm_dp_catalog *msm_dp_catalog) +{ +msm_dp_write_ahb (msm_dp_catalog,REG_DP_INTR_MASK4 ,DP_INTERRUPT_MASK4 ); +} +int msm_dp_catalog_ctrl_get_interrupt (struct msm_dp_catalog *msm_dp_catalog) {u32 intr, intr_ack;
@@ -509,96 +220,6 @@ int msm_dp_catalog_ctrl_get_interrupt(struct msm_dp_catalog *msm_dp_catalog)return intr; } -void msm_dp_catalog_ctrl_phy_reset (struct msm_dp_catalog *msm_dp_catalog) -{ -msm_dp_write_ahb (msm_dp_catalog,REG_DP_PHY_CTRL , -DP_PHY_CTRL_SW_RESET |DP_PHY_CTRL_SW_RESET_PLL ); -usleep_range (1000 ,1100 );/* h/w recommended delay */ -msm_dp_write_ahb (msm_dp_catalog,REG_DP_PHY_CTRL ,0x0 ); -} - -void msm_dp_catalog_ctrl_send_phy_pattern (struct msm_dp_catalog *msm_dp_catalog, -u32 pattern) -{ -struct msm_dp_catalog_private *catalog =container_of (msm_dp_catalog, - struct msm_dp_catalog_private, msm_dp_catalog); -u32 value =0x0 ; - -/* Make sure to clear the current pattern before starting a new one */ -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL ,0x0 ); - -drm_dbg_dp (catalog->drm_dev,"pattern: %#x\n" , pattern); -switch (pattern) { -case DP_PHY_TEST_PATTERN_D10_2 : -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_TRAINING_PATTERN1 ); -break ; -case DP_PHY_TEST_PATTERN_ERROR_COUNT : - value &= ~(1 <<16 ); -msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , - value); - value |=SCRAMBLER_RESET_COUNT_VALUE ; -msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , - value); -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS , -DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2 ); -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE ); -break ; -case DP_PHY_TEST_PATTERN_PRBS7 : -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_PRBS7 ); -break ; -case DP_PHY_TEST_PATTERN_80BIT_CUSTOM : -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_TEST_CUSTOM_PATTERN ); -/* 00111110000011111000001111100000 */ -msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG0 , -0x3E0F83E0 ); -/* 00001111100000111110000011111000 */ -msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG1 , -0x0F83E0F8 ); -/* 1111100000111110 */ -msm_dp_write_link (msm_dp_catalog,REG_DP_TEST_80BIT_CUSTOM_PATTERN_REG2 , -0x0000F83E ); -break ; -case DP_PHY_TEST_PATTERN_CP2520 : - value =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - value &= ~DP_MAINLINK_CTRL_SW_BYPASS_SCRAMBLER ; -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , value); - - value =DP_HBR2_ERM_PATTERN ; -msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , - value); - value |=SCRAMBLER_RESET_COUNT_VALUE ; -msm_dp_write_link (msm_dp_catalog,REG_DP_HBR2_COMPLIANCE_SCRAMBLER_RESET , - value); -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_LEVELS , -DP_MAINLINK_SAFE_TO_EXIT_LEVEL_2 ); -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_SYMBOL_ERR_MEASURE ); - value =msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL ); - value |=DP_MAINLINK_CTRL_ENABLE ; -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , value); -break ; -case DP_PHY_TEST_PATTERN_SEL_MASK : -msm_dp_write_link (msm_dp_catalog,REG_DP_MAINLINK_CTRL , -DP_MAINLINK_CTRL_ENABLE ); -msm_dp_write_link (msm_dp_catalog,REG_DP_STATE_CTRL , -DP_STATE_CTRL_LINK_TRAINING_PATTERN4 ); -break ; -default : -drm_dbg_dp (catalog->drm_dev, -"No valid test pattern requested: %#x\n" , pattern); -break ; - } -} - -u32 msm_dp_catalog_ctrl_read_phy_pattern (struct msm_dp_catalog *msm_dp_catalog) -{ -return msm_dp_read_link (msm_dp_catalog,REG_DP_MAINLINK_READY ); -} -/* panel related catalog functions */ int msm_dp_catalog_panel_timing_cfg (struct msm_dp_catalog *msm_dp_catalog,u32 total,u32 sync_start,u32 width_blanking,u32 msm_dp_active)
drivers/gpu/drm/msm/dp/dp_catalog.h +1 -21
@@ -136,37 +136,17 @@ void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_du32 msm_dp_catalog_aux_get_irq (struct msm_dp_catalog *msm_dp_catalog);/* DP Controller APIs */ -void msm_dp_catalog_ctrl_state_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 state); -void msm_dp_catalog_ctrl_config_ctrl (struct msm_dp_catalog *msm_dp_catalog,u32 config); -void msm_dp_catalog_ctrl_lane_mapping (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_mainlink_ctrl (struct msm_dp_catalog *msm_dp_catalog,bool enable); -void msm_dp_catalog_ctrl_psr_mainlink_enable (struct msm_dp_catalog *msm_dp_catalog,bool enable); -void msm_dp_catalog_setup_peripheral_flush (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_config_misc (struct msm_dp_catalog *msm_dp_catalog,u32 cc,u32 tb); -void msm_dp_catalog_ctrl_config_msa (struct msm_dp_catalog *msm_dp_catalog,u32 rate, -u32 stream_rate_khz,bool is_ycbcr_420); -int msm_dp_catalog_ctrl_set_pattern_state_bit (struct msm_dp_catalog *msm_dp_catalog,u32 pattern);u32 msm_dp_catalog_hw_revision (const struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_reset (struct msm_dp_catalog *msm_dp_catalog); -bool msm_dp_catalog_ctrl_mainlink_ready (struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_ctrl_enable_irq (struct msm_dp_catalog *msm_dp_catalog,bool enable);void msm_dp_catalog_hpd_config_intr (struct msm_dp_catalog *msm_dp_catalog,u32 intr_mask,bool en);void msm_dp_catalog_ctrl_hpd_enable (struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_ctrl_hpd_disable (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_config_psr (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_set_psr (struct msm_dp_catalog *msm_dp_catalog,bool enter);u32 msm_dp_catalog_link_is_connected (struct msm_dp_catalog *msm_dp_catalog);u32 msm_dp_catalog_hpd_get_intr_status (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_phy_reset (struct msm_dp_catalog *msm_dp_catalog);int msm_dp_catalog_ctrl_get_interrupt (struct msm_dp_catalog *msm_dp_catalog); +void msm_dp_catalog_ctrl_config_psr_interrupt (struct msm_dp_catalog *msm_dp_catalog);u32 msm_dp_catalog_ctrl_read_psr_interrupt_status (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_update_transfer_unit (struct msm_dp_catalog *msm_dp_catalog, -u32 msm_dp_tu,u32 valid_boundary, -u32 valid_boundary2); -void msm_dp_catalog_ctrl_send_phy_pattern (struct msm_dp_catalog *msm_dp_catalog, -u32 pattern); -u32 msm_dp_catalog_ctrl_read_phy_pattern (struct msm_dp_catalog *msm_dp_catalog);/* DP Panel APIs */ int msm_dp_catalog_panel_timing_cfg(struct msm_dp_catalog *msm_dp_catalog, u32 total,
drivers/gpu/drm/msm/dp/dp_ctrl.c +403 -44
662 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH 8/14 drm/msm/dp: move/inline panel related functions
In reply to Dmitry BaryshkovMove panel-related functions to dp_panel.c, following up the cleanup done by the rest of the submodules.
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 114 ------------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 6 -- drivers/gpu/drm/msm/dp/dp_ctrl.c | 4 +- drivers/gpu/drm/msm/dp/dp_panel.c | 114 ++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/msm/dp/dp_panel.h | 3 + 5 files changed, 113 insertions(+), 128 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -114
@@ -21,8 +21,6 @@#define DP_INTERRUPT_STATUS_ACK_SHIFT 1#define DP_INTERRUPT_STATUS_MASK_SHIFT 2 -#define DP_INTF_CONFIG_DATABUS_WIDEN BIT(4) -#define DP_INTERRUPT_STATUS1 \ (DP_INTR_AUX_XFER_DONE| \ DP_INTR_WRONG_ADDR | DP_INTR_TIMEOUT | \
@@ -220,118 +218,6 @@ int msm_dp_catalog_ctrl_get_interrupt(struct msm_dp_catalog *msm_dp_catalog)return intr; } -/* panel related catalog functions */ -int msm_dp_catalog_panel_timing_cfg (struct msm_dp_catalog *msm_dp_catalog,u32 total, -u32 sync_start,u32 width_blanking,u32 msm_dp_active) -{ -u32 reg; - -msm_dp_write_link (msm_dp_catalog,REG_DP_TOTAL_HOR_VER , total); -msm_dp_write_link (msm_dp_catalog,REG_DP_START_HOR_VER_FROM_SYNC , sync_start); -msm_dp_write_link (msm_dp_catalog,REG_DP_HSYNC_VSYNC_WIDTH_POLARITY , width_blanking); -msm_dp_write_link (msm_dp_catalog,REG_DP_ACTIVE_HOR_VER , msm_dp_active); - - reg =msm_dp_read_p0 (msm_dp_catalog,MMSS_DP_INTF_CONFIG ); - -if (msm_dp_catalog->wide_bus_en) - reg |=DP_INTF_CONFIG_DATABUS_WIDEN ; -else - reg &= ~DP_INTF_CONFIG_DATABUS_WIDEN ; - - -DRM_DEBUG_DP ("wide_bus_en=%d reg=%#x\n" , msm_dp_catalog->wide_bus_en, reg); - -msm_dp_write_p0 (msm_dp_catalog,MMSS_DP_INTF_CONFIG , reg); -return 0 ; -} - -static void msm_dp_catalog_panel_send_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp) -{ -u32 header[2 ]; -u32 val; -int i; - -msm_dp_utils_pack_sdp_header (&vsc_sdp->sdp_header, header); - -msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_0 , header[0 ]); -msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_1 , header[1 ]); - -for (i =0 ; i <sizeof (vsc_sdp->db); i +=4 ) { - val = ((vsc_sdp->db[i]) | (vsc_sdp->db[i +1 ] <<8 ) | (vsc_sdp->db[i +2 ] <<16 ) | - (vsc_sdp->db[i +3 ] <<24 )); -msm_dp_write_link (msm_dp_catalog,MMSS_DP_GENERIC0_2 + i, val); - } -} - -static void msm_dp_catalog_panel_update_sdp (struct msm_dp_catalog *msm_dp_catalog) -{ -u32 hw_revision; - - hw_revision =msm_dp_catalog_hw_revision (msm_dp_catalog); -if (hw_revision <DP_HW_VERSION_1_2 && hw_revision >=DP_HW_VERSION_1_0 ) { -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x01 ); -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG3 ,0x00 ); - } -} - -void msm_dp_catalog_panel_enable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp) -{ -struct msm_dp_catalog_private *catalog; -u32 cfg, cfg2, misc; - - catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - - cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG ); - cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 ); - misc =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 ); - - cfg |=GEN0_SDP_EN ; -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , cfg); - - cfg2 |=GENERIC0_SDPSIZE_VALID ; -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , cfg2); - -msm_dp_catalog_panel_send_vsc_sdp (msm_dp_catalog, vsc_sdp); - -/* indicates presence of VSC (BIT(6) of MISC1) */ - misc |=DP_MISC1_VSC_SDP ; - -drm_dbg_dp (catalog->drm_dev,"vsc sdp enable=1\n" ); - -pr_debug ("misc settings = 0x%x\n" , misc); -msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc); - -msm_dp_catalog_panel_update_sdp (msm_dp_catalog); -} - -void msm_dp_catalog_panel_disable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog) -{ -struct msm_dp_catalog_private *catalog; -u32 cfg, cfg2, misc; - - catalog = container_of(msm_dp_catalog, struct msm_dp_catalog_private, msm_dp_catalog); - - cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG ); - cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 ); - misc =msm_dp_read_link (msm_dp_catalog,REG_DP_MISC1_MISC0 ); - - cfg &= ~GEN0_SDP_EN ; -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , cfg); - - cfg2 &= ~GENERIC0_SDPSIZE_VALID ; -msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , cfg2); - -/* switch back to MSA */ - misc &= ~DP_MISC1_VSC_SDP ; - -drm_dbg_dp (catalog->drm_dev,"vsc sdp enable=0\n" ); - -pr_debug ("misc settings = 0x%x\n" , misc); -msm_dp_write_link (msm_dp_catalog,REG_DP_MISC1_MISC0 , misc); - -msm_dp_catalog_panel_update_sdp (msm_dp_catalog); -} -static void __iomem *msm_dp_ioremap (struct platform_device *pdev,int idx,size_t *len) {struct resource *res;
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -6
@@ -148,12 +148,6 @@ int msm_dp_catalog_ctrl_get_interrupt(struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_ctrl_config_psr_interrupt (struct msm_dp_catalog *msm_dp_catalog);u32 msm_dp_catalog_ctrl_read_psr_interrupt_status (struct msm_dp_catalog *msm_dp_catalog); -/* DP Panel APIs */ -int msm_dp_catalog_panel_timing_cfg (struct msm_dp_catalog *msm_dp_catalog,u32 total, -u32 sync_start,u32 width_blanking,u32 msm_dp_active); -void msm_dp_catalog_panel_enable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog,struct dp_sdp *vsc_sdp); -void msm_dp_catalog_panel_disable_vsc_sdp (struct msm_dp_catalog *msm_dp_catalog); -struct msm_dp_catalog *msm_dp_catalog_get (struct device *dev);/* DP Audio APIs */
drivers/gpu/drm/msm/dp/dp_ctrl.c +2 -2
@@ -2395,7 +2395,7 @@ void msm_dp_ctrl_off_link_stream(struct msm_dp_ctrl *msm_dp_ctrl) ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl); phy = ctrl->phy; -msm_dp_catalog_panel_disable_vsc_sdp (ctrl->catalog); +msm_dp_panel_disable_vsc_sdp (ctrl->panel);/* set dongle to D3 (power off) mode */ msm_dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, true);
@@ -2449,7 +2449,7 @@ void msm_dp_ctrl_off(struct msm_dp_ctrl *msm_dp_ctrl) ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl); phy = ctrl->phy; -msm_dp_catalog_panel_disable_vsc_sdp (ctrl->catalog); +msm_dp_panel_disable_vsc_sdp (ctrl->panel);msm_dp_ctrl_mainlink_disable (ctrl);
drivers/gpu/drm/msm/dp/dp_panel.c +108 -6
158 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_panel.h +3 -0
@@ -63,6 +63,9 @@ int msm_dp_panel_get_modes(struct msm_dp_panel *msm_dp_panel, struct drm_connector *connector);void msm_dp_panel_handle_sink_request (struct msm_dp_panel *msm_dp_panel); +void msm_dp_panel_enable_vsc_sdp (struct msm_dp_panel *msm_dp_panel,struct dp_sdp *vsc_sdp); +void msm_dp_panel_disable_vsc_sdp (struct msm_dp_panel *msm_dp_panel); +/** * is_link_rate_valid() - validates the link rate * @lane_rate: link rate requested by the sink
Signature · 1 line
2.39.5
PATCH 9/14 drm/msm/dp: use msm_dp_utils_pack_sdp_header() for audio packets
In reply to Dmitry BaryshkovUse msm_dp_utils_pack_sdp_header() and call msm_dp_write_link() directly to program audio packet data. Use 0 as Packet ID, as it was not programmed earlier.
--- drivers/gpu/drm/msm/dp/dp_audio.c | 288 +++++++++----------------------------- 1 file changed, 66 insertions(+), 222 deletions(-)
drivers/gpu/drm/msm/dp/dp_audio.c +66 -222
@@ -14,6 +14,7 @@#include "dp_catalog.h" #include "dp_audio.h" #include "dp_panel.h" +#include "dp_reg.h" #include "dp_display.h" #include "dp_utils.h"
@@ -28,251 +29,94 @@ struct msm_dp_audio_private {struct msm_dp_audio msm_dp_audio; }; -static u32 msm_dp_audio_get_header (struct msm_dp_catalog *catalog, -enum msm_dp_catalog_audio_sdp_type sdp, -enum msm_dp_catalog_audio_header_type header) -{ -return msm_dp_catalog_audio_get_header (catalog, sdp, header); -} - -static void msm_dp_audio_set_header (struct msm_dp_catalog *catalog, -u32 data, -enum msm_dp_catalog_audio_sdp_type sdp, -enum msm_dp_catalog_audio_header_type header) -{ -msm_dp_catalog_audio_set_header (catalog, sdp, header, data); -} -static void msm_dp_audio_stream_sdp (struct msm_dp_audio_private *audio) {struct msm_dp_catalog *catalog = audio->catalog; -u32 value, new_value; -u8 parity_byte; - -/* Config header and parity byte 1 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_1 ); - - new_value =0x02 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_1_BIT ) - | (parity_byte <<PARITY_BYTE_1_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_1 ); - -/* Config header and parity byte 2 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_2 ); - new_value = value; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_2_BIT ) - | (parity_byte <<PARITY_BYTE_2_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); - -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_2 ); - -/* Config header and parity byte 3 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_3 ); - - new_value = audio->channels -1 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_3_BIT ) - | (parity_byte <<PARITY_BYTE_3_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); - -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_STREAM ,DP_AUDIO_SDP_HEADER_3 ); +struct dp_sdp_header sdp_hdr = { + .HB0 =0x00 , + .HB1 =0x02 , + .HB2 =0x00 , + .HB3 = audio->channels -1 , + }; +u32 header[2 ]; + +msm_dp_utils_pack_sdp_header (&sdp_hdr, header); + +msm_dp_write_link (catalog,MMSS_DP_AUDIO_STREAM_0 , header[0 ]); +msm_dp_write_link (catalog,MMSS_DP_AUDIO_STREAM_1 , header[1 ]); }static void msm_dp_audio_timestamp_sdp (struct msm_dp_audio_private *audio) {struct msm_dp_catalog *catalog = audio->catalog; -u32 value, new_value; -u8 parity_byte; - -/* Config header and parity byte 1 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_1 ); - - new_value =0x1 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_1_BIT ) - | (parity_byte <<PARITY_BYTE_1_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_1 ); - -/* Config header and parity byte 2 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_2 ); - - new_value =0x17 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_2_BIT ) - | (parity_byte <<PARITY_BYTE_2_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_2 ); - -/* Config header and parity byte 3 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_3 ); - - new_value = (0x0 | (0x11 <<2 )); - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_3_BIT ) - | (parity_byte <<PARITY_BYTE_3_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_TIMESTAMP ,DP_AUDIO_SDP_HEADER_3 ); +struct dp_sdp_header sdp_hdr = { + .HB0 =0x00 , + .HB1 =0x01 , + .HB2 =0x17 , + .HB3 =0x0 | (0x11 <<2 ), + }; +u32 header[2 ]; + +msm_dp_utils_pack_sdp_header (&sdp_hdr, header); + +msm_dp_write_link (catalog,MMSS_DP_AUDIO_TIMESTAMP_0 , header[0 ]); +msm_dp_write_link (catalog,MMSS_DP_AUDIO_TIMESTAMP_1 , header[1 ]); }static void msm_dp_audio_infoframe_sdp (struct msm_dp_audio_private *audio) {struct msm_dp_catalog *catalog = audio->catalog; -u32 value, new_value; -u8 parity_byte; - -/* Config header and parity byte 1 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_1 ); - - new_value =0x84 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_1_BIT ) - | (parity_byte <<PARITY_BYTE_1_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_1 ); - -/* Config header and parity byte 2 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_2 ); - - new_value =0x1b ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_2_BIT ) - | (parity_byte <<PARITY_BYTE_2_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_2 ); - -/* Config header and parity byte 3 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_3 ); - - new_value = (0x0 | (0x11 <<2 )); - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_3_BIT ) - | (parity_byte <<PARITY_BYTE_3_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n" , - new_value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_INFOFRAME ,DP_AUDIO_SDP_HEADER_3 ); +struct dp_sdp_header sdp_hdr = { + .HB0 =0x00 , + .HB1 =0x84 , + .HB2 =0x1b , + .HB3 =0x0 | (0x11 <<2 ), + }; +u32 header[2 ]; + +msm_dp_utils_pack_sdp_header (&sdp_hdr, header); + +msm_dp_write_link (catalog,MMSS_DP_AUDIO_INFOFRAME_0 , header[0 ]); +msm_dp_write_link (catalog,MMSS_DP_AUDIO_INFOFRAME_1 , header[1 ]); }static void msm_dp_audio_copy_management_sdp (struct msm_dp_audio_private *audio) {struct msm_dp_catalog *catalog = audio->catalog; -u32 value, new_value; -u8 parity_byte; - -/* Config header and parity byte 1 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_1 ); - - new_value =0x05 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_1_BIT ) - | (parity_byte <<PARITY_BYTE_1_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_1 ); - -/* Config header and parity byte 2 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_2 ); - - new_value =0x0F ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_2_BIT ) - | (parity_byte <<PARITY_BYTE_2_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_2 ); - -/* Config header and parity byte 3 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_3 ); - - new_value =0x0 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_3_BIT ) - | (parity_byte <<PARITY_BYTE_3_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_COPYMANAGEMENT ,DP_AUDIO_SDP_HEADER_3 ); +struct dp_sdp_header sdp_hdr = { + .HB0 =0x00 , + .HB1 =0x05 , + .HB2 =0x0f , + .HB3 =0x00 , + }; +u32 header[2 ]; + +msm_dp_utils_pack_sdp_header (&sdp_hdr, header); + +msm_dp_write_link (catalog,MMSS_DP_AUDIO_COPYMANAGEMENT_0 , header[0 ]); +msm_dp_write_link (catalog,MMSS_DP_AUDIO_COPYMANAGEMENT_1 , header[1 ]); }static void msm_dp_audio_isrc_sdp (struct msm_dp_audio_private *audio) {struct msm_dp_catalog *catalog = audio->catalog; -u32 value, new_value; -u8 parity_byte; - -/* Config header and parity byte 1 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_ISRC ,DP_AUDIO_SDP_HEADER_1 ); - - new_value =0x06 ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_1_BIT ) - | (parity_byte <<PARITY_BYTE_1_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_ISRC ,DP_AUDIO_SDP_HEADER_1 ); - -/* Config header and parity byte 2 */ - value =msm_dp_audio_get_header (catalog, -DP_AUDIO_SDP_ISRC ,DP_AUDIO_SDP_HEADER_2 ); - - new_value =0x0F ; - parity_byte =msm_dp_utils_calculate_parity (new_value); - value |= ((new_value <<HEADER_BYTE_2_BIT ) - | (parity_byte <<PARITY_BYTE_2_BIT )); -drm_dbg_dp (audio->drm_dev, -"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n" , - value, parity_byte); -msm_dp_audio_set_header (catalog, value, -DP_AUDIO_SDP_ISRC ,DP_AUDIO_SDP_HEADER_2 ); +struct dp_sdp_header sdp_hdr = { + .HB0 =0x00 , + .HB1 =0x06 , + .HB2 =0x0f , + .HB3 =0x00 , + }; +u32 header[2 ]; +u32 reg; + +/* XXX: is it necessary to preserve this field? */ + reg =msm_dp_read_link (catalog,MMSS_DP_AUDIO_ISRC_1 ); + sdp_hdr.HB3 =FIELD_GET (HEADER_3_MASK , reg); + +msm_dp_utils_pack_sdp_header (&sdp_hdr, header); + +msm_dp_write_link (catalog,MMSS_DP_AUDIO_ISRC_0 , header[0 ]); +msm_dp_write_link (catalog,MMSS_DP_AUDIO_ISRC_1 , header[1 ]); }static void msm_dp_audio_setup_sdp (struct msm_dp_audio_private *audio)
Signature · 1 line
2.39.5
PATCH 10/14 drm/msm/dp: drop obsolete audio headers access through catalog
In reply to Dmitry BaryshkovDrop obsolete functions to access audio packet headers. The dp_audio.c now writes them using msm_dp_write_link() directly.
--- drivers/gpu/drm/msm/dp/dp_audio.c | 2 - drivers/gpu/drm/msm/dp/dp_catalog.c | 76 ------------------------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 24 ------------ 3 files changed, 102 deletions(-)
drivers/gpu/drm/msm/dp/dp_audio.c +0 -2
@@ -405,8 +405,6 @@ struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev, msm_dp_audio = &audio->msm_dp_audio; -msm_dp_catalog_audio_init (catalog); -return msm_dp_audio; error:return ERR_PTR (rc);
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -76
94 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -24
@@ -31,22 +31,6 @@#define DP_HW_VERSION_1_0 0x10000000#define DP_HW_VERSION_1_2 0x10020000 -enum msm_dp_catalog_audio_sdp_type { -DP_AUDIO_SDP_STREAM , -DP_AUDIO_SDP_TIMESTAMP , -DP_AUDIO_SDP_INFOFRAME , -DP_AUDIO_SDP_COPYMANAGEMENT , -DP_AUDIO_SDP_ISRC , -DP_AUDIO_SDP_MAX , -}; - -enum msm_dp_catalog_audio_header_type { -DP_AUDIO_SDP_HEADER_1 , -DP_AUDIO_SDP_HEADER_2 , -DP_AUDIO_SDP_HEADER_3 , -DP_AUDIO_SDP_HEADER_MAX , -}; -struct msm_dp_catalog {bool wide_bus_en;
@@ -151,17 +135,9 @@ u32 msm_dp_catalog_ctrl_read_psr_interrupt_status(struct msm_dp_catalog *msm_dp_struct msm_dp_catalog *msm_dp_catalog_get (struct device *dev);/* DP Audio APIs */ -u32 msm_dp_catalog_audio_get_header (struct msm_dp_catalog *msm_dp_catalog, -enum msm_dp_catalog_audio_sdp_type sdp, -enum msm_dp_catalog_audio_header_type header); -void msm_dp_catalog_audio_set_header (struct msm_dp_catalog *msm_dp_catalog, -enum msm_dp_catalog_audio_sdp_type sdp, -enum msm_dp_catalog_audio_header_type header, -u32 data);void msm_dp_catalog_audio_config_acr (struct msm_dp_catalog *catalog,u32 select);void msm_dp_catalog_audio_enable (struct msm_dp_catalog *catalog,bool enable);void msm_dp_catalog_audio_config_sdp (struct msm_dp_catalog *catalog); -void msm_dp_catalog_audio_init (struct msm_dp_catalog *catalog);void msm_dp_catalog_audio_sfe_level (struct msm_dp_catalog *catalog,u32 safe_to_exit_level);#endif /* _DP_CATALOG_H_ */
Signature · 1 line
2.39.5
PATCH 11/14 drm/msm/dp: move/inline audio related functions
In reply to Dmitry BaryshkovMove audio-related functions to dp_audio.c, following up the cleanup done by the rest of the submodules. Inline functions with simple register access patterns.
--- drivers/gpu/drm/msm/dp/dp_audio.c | 72 +++++++++++++++++++++---- drivers/gpu/drm/msm/dp/dp_catalog.c | 105 ------------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 6 --- 3 files changed, 63 insertions(+), 120 deletions(-)
drivers/gpu/drm/msm/dp/dp_audio.c +63 -9
@@ -119,9 +119,41 @@ static void msm_dp_audio_isrc_sdp(struct msm_dp_audio_private *audio)msm_dp_write_link (catalog,MMSS_DP_AUDIO_ISRC_1 , header[1 ]); } +static void msm_dp_audio_config_sdp (struct msm_dp_audio_private *audio) +{ +struct msm_dp_catalog *msm_dp_catalog = audio->catalog; +u32 sdp_cfg, sdp_cfg2; + + sdp_cfg =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG ); +/* AUDIO_TIMESTAMP_SDP_EN */ + sdp_cfg |=BIT (1 ); +/* AUDIO_STREAM_SDP_EN */ + sdp_cfg |=BIT (2 ); +/* AUDIO_COPY_MANAGEMENT_SDP_EN */ + sdp_cfg |=BIT (5 ); +/* AUDIO_ISRC_SDP_EN */ + sdp_cfg |=BIT (6 ); +/* AUDIO_INFOFRAME_SDP_EN */ + sdp_cfg |=BIT (20 ); + +drm_dbg_dp (audio->drm_dev,"sdp_cfg = 0x%x\n" , sdp_cfg); + +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG , sdp_cfg); + + sdp_cfg2 =msm_dp_read_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 ); +/* IFRM_REGSRC -> Do not use reg values */ + sdp_cfg2 &= ~BIT (0 ); +/* AUDIO_STREAM_HB3_REGSRC-> Do not use reg values */ + sdp_cfg2 &= ~BIT (1 ); + +drm_dbg_dp (audio->drm_dev,"sdp_cfg2 = 0x%x\n" , sdp_cfg2); + +msm_dp_write_link (msm_dp_catalog,MMSS_DP_SDP_CFG2 , sdp_cfg2); +} +static void msm_dp_audio_setup_sdp (struct msm_dp_audio_private *audio) { -msm_dp_catalog_audio_config_sdp (audio->catalog); +msm_dp_audio_config_sdp (audio);msm_dp_audio_stream_sdp (audio);msm_dp_audio_timestamp_sdp (audio);
@@ -132,8 +164,7 @@ static void msm_dp_audio_setup_sdp(struct msm_dp_audio_private *audio)static void msm_dp_audio_setup_acr (struct msm_dp_audio_private *audio) { -u32 select =0 ; -struct msm_dp_catalog *catalog = audio->catalog; +u32 select, acr_ctrl;switch (audio->msm_dp_audio.bw_code) {case DP_LINK_BW_1_62 :
@@ -154,13 +185,17 @@ static void msm_dp_audio_setup_acr(struct msm_dp_audio_private *audio)break ; } -msm_dp_catalog_audio_config_acr (catalog, select); + acr_ctrl = select <<4 |BIT (31 ) |BIT (8 ) |BIT (14 ); + +drm_dbg_dp (audio->drm_dev,"select: %#x, acr_ctrl: %#x\n" , + select, acr_ctrl); + +msm_dp_write_link (audio->catalog,MMSS_DP_AUDIO_ACR_CTRL , acr_ctrl); }static void msm_dp_audio_safe_to_exit_level (struct msm_dp_audio_private *audio) { -struct msm_dp_catalog *catalog = audio->catalog; -u32 safe_to_exit_level =0 ; +u32 safe_to_exit_level, mainlink_levels;switch (audio->msm_dp_audio.lane_count) {case 1 :
@@ -180,14 +215,33 @@ static void msm_dp_audio_safe_to_exit_level(struct msm_dp_audio_private *audio)break ; } -msm_dp_catalog_audio_sfe_level (catalog, safe_to_exit_level); + mainlink_levels =msm_dp_read_link (audio->catalog,REG_DP_MAINLINK_LEVELS ); + mainlink_levels &=0xFE0 ; + mainlink_levels |= safe_to_exit_level; + +drm_dbg_dp (audio->drm_dev, +"mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n" , + mainlink_levels, safe_to_exit_level); + +msm_dp_write_link (audio->catalog,REG_DP_MAINLINK_LEVELS , mainlink_levels); }static void msm_dp_audio_enable (struct msm_dp_audio_private *audio,bool enable) { -struct msm_dp_catalog *catalog = audio->catalog; +u32 audio_ctrl; + + audio_ctrl =msm_dp_read_link (audio->catalog,MMSS_DP_AUDIO_CFG ); + +if (enable) + audio_ctrl |=BIT (0 ); +else + audio_ctrl &= ~BIT (0 ); + +drm_dbg_dp (audio->drm_dev,"dp_audio_cfg = 0x%x\n" , audio_ctrl); -msm_dp_catalog_audio_enable (catalog, enable); +msm_dp_write_link (audio->catalog,MMSS_DP_AUDIO_CFG , audio_ctrl); +/* make sure audio engine is disabled */ +wmb (); }static struct msm_dp_audio_private *msm_dp_audio_get_data (struct platform_device *pdev)
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -105
108 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -6
@@ -134,10 +134,4 @@ u32 msm_dp_catalog_ctrl_read_psr_interrupt_status(struct msm_dp_catalog *msm_dp_struct msm_dp_catalog *msm_dp_catalog_get (struct device *dev); -/* DP Audio APIs */ -void msm_dp_catalog_audio_config_acr (struct msm_dp_catalog *catalog,u32 select); -void msm_dp_catalog_audio_enable (struct msm_dp_catalog *catalog,bool enable); -void msm_dp_catalog_audio_config_sdp (struct msm_dp_catalog *catalog); -void msm_dp_catalog_audio_sfe_level (struct msm_dp_catalog *catalog,u32 safe_to_exit_level); -#endif /* _DP_CATALOG_H_ */
Signature · 1 line
2.39.5
kernel test robot
build botRe: [PATCH 11/14] drm/msm/dp: move/inline audio related functions
kernel test robot noticed the following build warnings:
Hi Dmitry,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 74741a050b79d31d8d2eeee12c77736596d0a6b2]
url: https://github.com/intel-lab-lkp/linux/commits/Dmitry-Baryshkov/drm-msm-dp-fix-msm_dp_utils_pack_sdp_header-interface/20241108-082302 base: 74741a050b79d31d8d2eeee12c77736596d0a6b2 patch link: https://lore.kernel.org/r/20241108-fd-dp-audio-fixup-v1-11-40c8eeb60cf5%40linaro.org patch subject: [PATCH 11/14] drm/msm/dp: move/inline audio related functions config: x86_64-buildonly-randconfig-002-20241108 (https://download.01.org/0day-ci/archive/20241108/[email protected]/config) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241108/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/msm/dp/dp_audio.c:11:
In file included from include/drm/display/drm_dp_helper.h:27:
In file included from include/linux/i2c.h:19:
In file included from include/linux/regulator/consumer.h:35:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
In file included from include/linux/memcontrol.h:21:
In file included from include/linux/mm.h:2223:
include/linux/vmstat.h:518:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
518 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
>> drivers/gpu/drm/msm/dp/dp_audio.c:213:5: warning: variable 'safe_to_exit_level' is uninitialized when used here [-Wuninitialized]
213 | safe_to_exit_level);
| ^~~~~~~~~~~~~~~~~~
include/drm/drm_print.h:636:59: note: expanded from macro 'drm_dbg_dp'
636 | drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~
include/drm/drm_print.h:540:39: note: expanded from macro 'drm_dev_dbg'
540 | __drm_dev_dbg(NULL, dev, cat, fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~
drivers/gpu/drm/msm/dp/dp_audio.c:198:24: note: initialize the variable 'safe_to_exit_level' to silence this warning
198 | u32 safe_to_exit_level, mainlink_levels;
| ^
| = 02 warnings generated.
vim +/safe_to_exit_level +213 drivers/gpu/drm/msm/dp/dp_audio.c
d13e36d7d2227e Abhinav Kumar 2020-09-12 195
fb7d509b1710d1 Dmitry Baryshkov 2024-10-29 196 static void msm_dp_audio_safe_to_exit_level(struct msm_dp_audio_private *audio)
d13e36d7d2227e Abhinav Kumar 2020-09-12 197 {
568837beeb38ef Dmitry Baryshkov 2024-11-08 198 u32 safe_to_exit_level, mainlink_levels;
d13e36d7d2227e Abhinav Kumar 2020-09-12 199
fb7d509b1710d1 Dmitry Baryshkov 2024-10-29 200 switch (audio->msm_dp_audio.lane_count) {
d13e36d7d2227e Abhinav Kumar 2020-09-12 201 case 1:
d13e36d7d2227e Abhinav Kumar 2020-09-12 202 safe_to_exit_level = 14;
d13e36d7d2227e Abhinav Kumar 2020-09-12 203 break;
d13e36d7d2227e Abhinav Kumar 2020-09-12 204 case 2:
d13e36d7d2227e Abhinav Kumar 2020-09-12 205 safe_to_exit_level = 8;
d13e36d7d2227e Abhinav Kumar 2020-09-12 206 break;
d13e36d7d2227e Abhinav Kumar 2020-09-12 207 case 4:
d13e36d7d2227e Abhinav Kumar 2020-09-12 208 safe_to_exit_level = 5;
d13e36d7d2227e Abhinav Kumar 2020-09-12 209 break;
d13e36d7d2227e Abhinav Kumar 2020-09-12 210 default:
202aceac8bb3ae Kuogee Hsieh 2022-02-17 211 drm_dbg_dp(audio->drm_dev,
202aceac8bb3ae Kuogee Hsieh 2022-02-17 212 "setting the default safe_to_exit_level = %u\n",
d13e36d7d2227e Abhinav Kumar 2020-09-12 @213 safe_to_exit_level);
d13e36d7d2227e Abhinav Kumar 2020-09-12 214 safe_to_exit_level = 14;
d13e36d7d2227e Abhinav Kumar 2020-09-12 215 break;
d13e36d7d2227e Abhinav Kumar 2020-09-12 216 }
d13e36d7d2227e Abhinav Kumar 2020-09-12 217
568837beeb38ef Dmitry Baryshkov 2024-11-08 218 mainlink_levels = msm_dp_read_link(audio->catalog, REG_DP_MAINLINK_LEVELS);
568837beeb38ef Dmitry Baryshkov 2024-11-08 219 mainlink_levels &= 0xFE0;
568837beeb38ef Dmitry Baryshkov 2024-11-08 220 mainlink_levels |= safe_to_exit_level;
568837beeb38ef Dmitry Baryshkov 2024-11-08 221
568837beeb38ef Dmitry Baryshkov 2024-11-08 222 drm_dbg_dp(audio->drm_dev,
568837beeb38ef Dmitry Baryshkov 2024-11-08 223 "mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n",
568837beeb38ef Dmitry Baryshkov 2024-11-08 224 mainlink_levels, safe_to_exit_level);
568837beeb38ef Dmitry Baryshkov 2024-11-08 225
568837beeb38ef Dmitry Baryshkov 2024-11-08 226 msm_dp_write_link(audio->catalog, REG_DP_MAINLINK_LEVELS, mainlink_levels);
d13e36d7d2227e Abhinav Kumar 2020-09-12 227 }
d13e36d7d2227e Abhinav Kumar 2020-09-12 228 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH 12/14 drm/msm/dp: move more AUX functions to dp_aux.c
In reply to Dmitry BaryshkovMove several misnamed functions accessing AUX bus to dp_aux.c, further cleaning up dp_catalog submodule.
--- drivers/gpu/drm/msm/dp/dp_aux.c | 88 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_aux.h | 7 +++ drivers/gpu/drm/msm/dp/dp_catalog.c | 75 +------------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 6 --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 4 +- drivers/gpu/drm/msm/dp/dp_display.c | 18 ++++---- drivers/gpu/drm/msm/dp/dp_panel.c | 2 +- 7 files changed, 107 insertions(+), 93 deletions(-)
drivers/gpu/drm/msm/dp/dp_aux.c +87 -1
@@ -405,7 +405,7 @@ static ssize_t msm_dp_aux_transfer(struct drm_dp_aux *msm_dp_aux,phy_calibrate (aux->phy); }/* reset aux if link is in connected state */ -if (msm_dp_catalog_link_is_connected (aux->catalog)) +if (msm_dp_aux_is_link_connected (msm_dp_aux))msm_dp_aux_reset (aux); }else { aux->retry_cnt =0 ;
@@ -593,6 +593,92 @@ static int msm_dp_wait_hpd_asserted(struct drm_dp_aux *msm_dp_aux,return ret; } +void msm_dp_aux_hpd_enable (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 reg; + +/* Configure REFTIMER and enable it */ + reg =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER ); + reg |=DP_DP_HPD_REFTIMER_ENABLE ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER , reg); + +/* Enable HPD */ +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_CTRL ,DP_DP_HPD_CTRL_HPD_EN ); +} + +void msm_dp_aux_hpd_disable (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 reg; + + reg =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER ); + reg &= ~DP_DP_HPD_REFTIMER_ENABLE ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_REFTIMER , reg); + +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_CTRL ,0 ); +} + +void msm_dp_aux_hpd_intr_enable (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 reg; + + reg =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK ); + reg |=DP_DP_HPD_INT_MASK ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK , + reg &DP_DP_HPD_INT_MASK ); +} + +void msm_dp_aux_hpd_intr_disable (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 reg; + + reg =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK ); + reg &= ~DP_DP_HPD_INT_MASK ; +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK , + reg &DP_DP_HPD_INT_MASK ); +} + +u32 msm_dp_aux_get_hpd_intr_status (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +int isr, mask; + + isr =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_STATUS ); +msm_dp_write_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_ACK , + (isr &DP_DP_HPD_INT_MASK )); + mask =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_MASK ); + +/* +* We only want to return interrupts that are unmasked to the caller. +* However, the interrupt status field also contains other +* informational bits about the HPD state status, so we only mask +* out the part of the register that tells us about which interrupts +* are pending. +*/ +return isr & (mask | ~DP_DP_HPD_INT_MASK ); +} + +u32 msm_dp_aux_is_link_connected (struct drm_dp_aux *msm_dp_aux) +{ + struct msm_dp_aux_private *aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); +struct msm_dp_catalog *msm_dp_catalog = aux->catalog; +u32 status; + + status =msm_dp_read_aux (msm_dp_catalog,REG_DP_DP_HPD_INT_STATUS ); + status >>=DP_DP_HPD_STATE_STATUS_BITS_SHIFT ; + status &=DP_DP_HPD_STATE_STATUS_BITS_MASK ; + +return status; +} +struct drm_dp_aux *msm_dp_aux_get (struct device *dev,struct msm_dp_catalog *catalog,struct phy *phy,bool is_edp)
drivers/gpu/drm/msm/dp/dp_aux.h +7 -0
@@ -17,6 +17,13 @@ void msm_dp_aux_init(struct drm_dp_aux *msm_dp_aux);void msm_dp_aux_deinit (struct drm_dp_aux *msm_dp_aux);void msm_dp_aux_reconfig (struct drm_dp_aux *msm_dp_aux); +void msm_dp_aux_hpd_enable (struct drm_dp_aux *msm_dp_aux); +void msm_dp_aux_hpd_disable (struct drm_dp_aux *msm_dp_aux); +void msm_dp_aux_hpd_intr_enable (struct drm_dp_aux *msm_dp_aux); +void msm_dp_aux_hpd_intr_disable (struct drm_dp_aux *msm_dp_aux); +u32 msm_dp_aux_get_hpd_intr_status (struct drm_dp_aux *msm_dp_aux); +u32 msm_dp_aux_is_link_connected (struct drm_dp_aux *msm_dp_aux); +struct phy ; struct drm_dp_aux *msm_dp_aux_get(struct device *dev, struct msm_dp_catalog *catalog, struct phy *phy,
drivers/gpu/drm/msm/dp/dp_catalog.c +2 -73
87 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -6
@@ -122,12 +122,6 @@ u32 msm_dp_catalog_aux_get_irq(struct msm_dp_catalog *msm_dp_catalog);/* DP Controller APIs */ u32 msm_dp_catalog_hw_revision (const struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_ctrl_enable_irq (struct msm_dp_catalog *msm_dp_catalog,bool enable); -void msm_dp_catalog_hpd_config_intr (struct msm_dp_catalog *msm_dp_catalog, -u32 intr_mask,bool en); -void msm_dp_catalog_ctrl_hpd_enable (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_hpd_disable (struct msm_dp_catalog *msm_dp_catalog); -u32 msm_dp_catalog_link_is_connected (struct msm_dp_catalog *msm_dp_catalog); -u32 msm_dp_catalog_hpd_get_intr_status (struct msm_dp_catalog *msm_dp_catalog);int msm_dp_catalog_ctrl_get_interrupt (struct msm_dp_catalog *msm_dp_catalog);void msm_dp_catalog_ctrl_config_psr_interrupt (struct msm_dp_catalog *msm_dp_catalog);u32 msm_dp_catalog_ctrl_read_psr_interrupt_status (struct msm_dp_catalog *msm_dp_catalog);
drivers/gpu/drm/msm/dp/dp_ctrl.c +2 -2
@@ -2162,7 +2162,7 @@ int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl)break ; }else if (training_step ==DP_TRAINING_1 ) {/* link train_1 failed */ -if (!msm_dp_catalog_link_is_connected (ctrl->catalog)) +if (!msm_dp_aux_is_link_connected (ctrl->aux))break ;msm_dp_ctrl_read_link_status (ctrl, link_status);
@@ -2187,7 +2187,7 @@ int msm_dp_ctrl_on_link(struct msm_dp_ctrl *msm_dp_ctrl) } }else if (training_step ==DP_TRAINING_2 ) {/* link train_2 failed */ -if (!msm_dp_catalog_link_is_connected (ctrl->catalog)) +if (!msm_dp_aux_is_link_connected (ctrl->aux))break ;msm_dp_ctrl_read_link_status (ctrl, link_status);
drivers/gpu/drm/msm/dp/dp_display.c +8 -10
@@ -1145,7 +1145,7 @@ static irqreturn_t msm_dp_display_irq_handler(int irq, void *dev_id)return IRQ_NONE ; } - hpd_isr_status =msm_dp_catalog_hpd_get_intr_status (dp->catalog); + hpd_isr_status =msm_dp_aux_get_hpd_intr_status (dp->aux);if (hpd_isr_status &0x0F ) { drm_dbg_dp(dp->drm_dev, "type=%d isr=0x%x\n",
@@ -1360,7 +1360,7 @@ static int msm_dp_pm_runtime_suspend(struct device *dev)if (dp->msm_dp_display.is_edp) {msm_dp_display_host_phy_exit (dp); -msm_dp_catalog_ctrl_hpd_disable (dp->catalog); +msm_dp_aux_hpd_disable (dp->aux); }msm_dp_display_host_deinit (dp);
@@ -1381,7 +1381,7 @@ static int msm_dp_pm_runtime_resume(struct device *dev)*/ msm_dp_display_host_init (dp);if (dp->msm_dp_display.is_edp) { -msm_dp_catalog_ctrl_hpd_enable (dp->catalog); +msm_dp_aux_hpd_enable (dp->aux);msm_dp_display_host_phy_init (dp); }
@@ -1668,10 +1668,8 @@ void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge)return ; } -msm_dp_catalog_ctrl_hpd_enable (dp->catalog); - -/* enable HDP interrupts */ -msm_dp_catalog_hpd_config_intr (dp->catalog,DP_DP_HPD_INT_MASK , true); +msm_dp_aux_hpd_enable (dp->aux); +msm_dp_aux_hpd_intr_enable (dp->aux); msm_dp_display->internal_hpd = true;mutex_unlock (&dp->event_mutex);
@@ -1684,9 +1682,9 @@ void msm_dp_bridge_hpd_disable(struct drm_bridge *bridge) struct msm_dp_display_private *dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display);mutex_lock (&dp->event_mutex); -/* disable HDP interrupts */ -msm_dp_catalog_hpd_config_intr (dp->catalog,DP_DP_HPD_INT_MASK , false); -msm_dp_catalog_ctrl_hpd_disable (dp->catalog); + +msm_dp_aux_hpd_intr_disable (dp->aux); +msm_dp_aux_hpd_disable (dp->aux); msm_dp_display->internal_hpd = false;
drivers/gpu/drm/msm/dp/dp_panel.c +1 -1
@@ -165,7 +165,7 @@ int msm_dp_panel_read_sink_caps(struct msm_dp_panel *msm_dp_panel,if (!msm_dp_panel->drm_edid) {DRM_ERROR ("panel edid read failed\n" );/* check edid read fail is due to unplug */ -if (!msm_dp_catalog_link_is_connected (panel->catalog)) { +if (!msm_dp_aux_is_link_connected (panel->aux)) { rc = -ETIMEDOUT ; goto end; }
Signature · 1 line
2.39.5
PATCH 13/14 drm/msm/dp: drop struct msm_dp_panel_in
In reply to Dmitry BaryshkovAll other submodules pass arguments directly. Drop struct msm_dp_panel_in that is used to wrap dp_panel's submodule args and pass all data to msm_dp_panel_get() directly.
--- drivers/gpu/drm/msm/dp/dp_display.c | 9 +-------- drivers/gpu/drm/msm/dp/dp_panel.c | 15 ++++++++------- drivers/gpu/drm/msm/dp/dp_panel.h | 10 ++-------- 3 files changed, 11 insertions(+), 23 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -8
@@ -722,9 +722,6 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp) {int rc =0 ;struct device *dev = &dp->msm_dp_display.pdev->dev; -struct msm_dp_panel_in panel_in = { - .dev = dev, - };struct phy *phy; phy =devm_phy_get (dev,"dp" );
@@ -765,11 +762,7 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp) goto error_link; } - panel_in.aux = dp->aux; - panel_in.catalog = dp->catalog; - panel_in.link = dp->link; - - dp->panel =msm_dp_panel_get (&panel_in); + dp->panel =msm_dp_panel_get (dev, dp->aux, dp->link, dp->catalog);if (IS_ERR (dp->panel)) { rc =PTR_ERR (dp->panel);DRM_ERROR ("failed to initialize panel, rc = %d\n" , rc);
drivers/gpu/drm/msm/dp/dp_panel.c +8 -7
@@ -549,25 +549,26 @@ static int msm_dp_panel_parse_dt(struct msm_dp_panel *msm_dp_panel)return 0 ; } -struct msm_dp_panel *msm_dp_panel_get (struct msm_dp_panel_in *in) +struct msm_dp_panel *msm_dp_panel_get (struct device *dev,struct drm_dp_aux *aux, +struct msm_dp_link *link,struct msm_dp_catalog *catalog) {struct msm_dp_panel_private *panel;struct msm_dp_panel *msm_dp_panel;int ret; -if (!in->dev || !in->catalog || !in->aux || !in->link) { +if (!dev || !catalog || !aux || !link) {DRM_ERROR ("invalid input\n" );return ERR_PTR (-EINVAL ); } - panel =devm_kzalloc (in->dev,sizeof (*panel),GFP_KERNEL ); + panel =devm_kzalloc (dev,sizeof (*panel),GFP_KERNEL );if (!panel)return ERR_PTR (-ENOMEM ); - panel->dev = in->dev; - panel->aux = in->aux; - panel->catalog = in->catalog; - panel->link = in->link; + panel->dev = dev; + panel->aux = aux; + panel->catalog = catalog; + panel->link = link; msm_dp_panel = &panel->msm_dp_panel; msm_dp_panel->max_bw_code =DP_LINK_BW_8_1 ;
drivers/gpu/drm/msm/dp/dp_panel.h +2 -8
@@ -21,13 +21,6 @@ struct msm_dp_display_mode {bool out_fmt_is_yuv_420; }; -struct msm_dp_panel_in { -struct device *dev; -struct drm_dp_aux *aux; -struct msm_dp_link *link; -struct msm_dp_catalog *catalog; -}; -struct msm_dp_panel_psr {u8 version;u8 capabilities;
@@ -93,6 +86,7 @@ static inline bool is_lane_count_valid(u32 lane_count) lane_count == 4); } -struct msm_dp_panel *msm_dp_panel_get (struct msm_dp_panel_in *in); +struct msm_dp_panel *msm_dp_panel_get (struct device *dev,struct drm_dp_aux *aux, +struct msm_dp_link *link,struct msm_dp_catalog *catalog);void msm_dp_panel_put (struct msm_dp_panel *msm_dp_panel);#endif /* _DP_PANEL_H_ */
Signature · 1 line
2.39.5
PATCH 14/14 drm/msm/dp: move interrupt handling to dp_ctrl
In reply to Dmitry BaryshkovIt makes it easier to keep all interrupts-related code in dp_ctrl submodule. Move all functions to dp_ctrl.c.
--- drivers/gpu/drm/msm/dp/dp_aux.c | 9 +-- drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 95 ------------------------ drivers/gpu/drm/msm/dp/dp_catalog.h | 24 ------ drivers/gpu/drm/msm/dp/dp_ctrl.c | 142 ++++++++++++++++++++++++++++++------ drivers/gpu/drm/msm/dp/dp_ctrl.h | 5 +- drivers/gpu/drm/msm/dp/dp_display.c | 9 +-- drivers/gpu/drm/msm/dp/dp_reg.h | 17 +++++ 8 files changed, 145 insertions(+), 158 deletions(-)
drivers/gpu/drm/msm/dp/dp_aux.c +1 -8
@@ -439,9 +439,8 @@ static ssize_t msm_dp_aux_transfer(struct drm_dp_aux *msm_dp_aux,return ret; } -irqreturn_t msm_dp_aux_isr (struct drm_dp_aux *msm_dp_aux) +irqreturn_t msm_dp_aux_isr (struct drm_dp_aux *msm_dp_aux,u32 isr) { -u32 isr;struct msm_dp_aux_private *aux;if (!msm_dp_aux) {
@@ -451,12 +450,6 @@ irqreturn_t msm_dp_aux_isr(struct drm_dp_aux *msm_dp_aux) aux = container_of(msm_dp_aux, struct msm_dp_aux_private, msm_dp_aux); - isr =msm_dp_catalog_aux_get_irq (aux->catalog); - -/* no interrupts pending, return immediately */ -if (!isr) -return IRQ_NONE ; -if (!aux->cmd_busy) {DRM_ERROR ("Unexpected DP AUX IRQ %#010x when not busy\n" , isr);return IRQ_NONE ;
drivers/gpu/drm/msm/dp/dp_aux.h +1 -1
@@ -11,7 +11,7 @@int msm_dp_aux_register (struct drm_dp_aux *msm_dp_aux);void msm_dp_aux_unregister (struct drm_dp_aux *msm_dp_aux); -irqreturn_t msm_dp_aux_isr (struct drm_dp_aux *msm_dp_aux); +irqreturn_t msm_dp_aux_isr (struct drm_dp_aux *msm_dp_aux,u32 isr);void msm_dp_aux_enable_xfers (struct drm_dp_aux *msm_dp_aux,bool enabled);void msm_dp_aux_init (struct drm_dp_aux *msm_dp_aux);void msm_dp_aux_deinit (struct drm_dp_aux *msm_dp_aux);
drivers/gpu/drm/msm/dp/dp_catalog.c +0 -95
113 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +0 -24
@@ -11,23 +11,6 @@#include "dp_utils.h" #include "disp/msm_disp_snapshot.h" -/* interrupts */ -#define DP_INTR_HPD BIT(0) -#define DP_INTR_AUX_XFER_DONE BIT(3) -#define DP_INTR_WRONG_ADDR BIT(6) -#define DP_INTR_TIMEOUT BIT(9) -#define DP_INTR_NACK_DEFER BIT(12) -#define DP_INTR_WRONG_DATA_CNT BIT(15) -#define DP_INTR_I2C_NACK BIT(18) -#define DP_INTR_I2C_DEFER BIT(21) -#define DP_INTR_PLL_UNLOCKED BIT(24) -#define DP_INTR_AUX_ERROR BIT(27) - -#define DP_INTR_READY_FOR_VIDEO BIT(0) -#define DP_INTR_IDLE_PATTERN_SENT BIT(3) -#define DP_INTR_FRAME_END BIT(6) -#define DP_INTR_CRC_UPDATED BIT(9) -#define DP_HW_VERSION_1_0 0x10000000#define DP_HW_VERSION_1_2 0x10020000
@@ -116,15 +99,8 @@ static inline void msm_dp_write_link(struct msm_dp_catalog *msm_dp_catalog,/* Debug module */ void msm_dp_catalog_snapshot (struct msm_dp_catalog *msm_dp_catalog,struct msm_disp_state *disp_state); -/* AUX APIs */ -u32 msm_dp_catalog_aux_get_irq (struct msm_dp_catalog *msm_dp_catalog); -/* DP Controller APIs */ u32 msm_dp_catalog_hw_revision (const struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_enable_irq (struct msm_dp_catalog *msm_dp_catalog,bool enable); -int msm_dp_catalog_ctrl_get_interrupt (struct msm_dp_catalog *msm_dp_catalog); -void msm_dp_catalog_ctrl_config_psr_interrupt (struct msm_dp_catalog *msm_dp_catalog); -u32 msm_dp_catalog_ctrl_read_psr_interrupt_status (struct msm_dp_catalog *msm_dp_catalog);struct msm_dp_catalog *msm_dp_catalog_get (struct device *dev);
drivers/gpu/drm/msm/dp/dp_ctrl.c +118 -24
203 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.h +4 -1
@@ -30,7 +30,7 @@ struct msm_dp_ctrl *msm_dp_ctrl_get(struct device *dev, struct msm_dp_link *linkstruct msm_dp_catalog *catalog, struct phy *phy); -void msm_dp_ctrl_reset_irq_ctrl (struct msm_dp_ctrl *msm_dp_ctrl,bool enable); +void msm_dp_ctrl_reset (struct msm_dp_ctrl *msm_dp_ctrl);void msm_dp_ctrl_phy_init (struct msm_dp_ctrl *msm_dp_ctrl);void msm_dp_ctrl_phy_exit (struct msm_dp_ctrl *msm_dp_ctrl);void msm_dp_ctrl_irq_phy_exit (struct msm_dp_ctrl *msm_dp_ctrl);
@@ -41,4 +41,7 @@ void msm_dp_ctrl_config_psr(struct msm_dp_ctrl *msm_dp_ctrl);int msm_dp_ctrl_core_clk_enable (struct msm_dp_ctrl *msm_dp_ctrl);void msm_dp_ctrl_core_clk_disable (struct msm_dp_ctrl *msm_dp_ctrl); +void msm_dp_ctrl_enable_irq (struct msm_dp_ctrl *msm_dp_ctrl); +void msm_dp_ctrl_disable_irq (struct msm_dp_ctrl *msm_dp_ctrl); +#endif /* _DP_CTRL_H_ */
drivers/gpu/drm/msm/dp/dp_display.c +4 -5
@@ -440,7 +440,8 @@ static void msm_dp_display_host_init(struct msm_dp_display_private *dp) dp->phy_initialized);msm_dp_ctrl_core_clk_enable (dp->ctrl); -msm_dp_ctrl_reset_irq_ctrl (dp->ctrl, true); +msm_dp_ctrl_reset (dp->ctrl); +msm_dp_ctrl_enable_irq (dp->ctrl);msm_dp_aux_init (dp->aux); dp->core_initialized = true; }
@@ -451,7 +452,8 @@ static void msm_dp_display_host_deinit(struct msm_dp_display_private *dp) dp->msm_dp_display.connector_type, dp->core_initialized, dp->phy_initialized); -msm_dp_ctrl_reset_irq_ctrl (dp->ctrl, false); +msm_dp_ctrl_reset (dp->ctrl); +msm_dp_ctrl_disable_irq (dp->ctrl);msm_dp_aux_deinit (dp->aux);msm_dp_ctrl_core_clk_disable (dp->ctrl); dp->core_initialized = false;
@@ -1165,9 +1167,6 @@ static irqreturn_t msm_dp_display_irq_handler(int irq, void *dev_id)/* DP controller isr */ ret |=msm_dp_ctrl_isr (dp->ctrl); -/* DP aux isr */ - ret |=msm_dp_aux_isr (dp->aux); -return ret; }
drivers/gpu/drm/msm/dp/dp_reg.h +17 -0
@@ -21,8 +21,25 @@#define REG_DP_CLK_CTRL (0x00000018)#define REG_DP_CLK_ACTIVE (0x0000001C) +#define REG_DP_INTR_STATUS (0x00000020) +#define DP_INTR_HPD BIT(0) +#define DP_INTR_AUX_XFER_DONE BIT(3) +#define DP_INTR_WRONG_ADDR BIT(6) +#define DP_INTR_TIMEOUT BIT(9) +#define DP_INTR_NACK_DEFER BIT(12) +#define DP_INTR_WRONG_DATA_CNT BIT(15) +#define DP_INTR_I2C_NACK BIT(18) +#define DP_INTR_I2C_DEFER BIT(21) +#define DP_INTR_PLL_UNLOCKED BIT(24) +#define DP_INTR_AUX_ERROR BIT(27) +#define REG_DP_INTR_STATUS2 (0x00000024) +#define DP_INTR_READY_FOR_VIDEO BIT(0) +#define DP_INTR_IDLE_PATTERN_SENT BIT(3) +#define DP_INTR_FRAME_END BIT(6) +#define DP_INTR_CRC_UPDATED BIT(9) +#define REG_DP_INTR_STATUS3 (0x00000028)#define REG_DP_INTR_STATUS4 (0x0000002C)
Signature · 1 line
2.39.5