Add support for DisplayPort driver on SnapDragon
Subsystems (6)
v12 cover Add support for DisplayPort driver on SnapDragon
These patches add Display-Port driver on SnapDragon/msm hardware. This series also contains device-tree bindings for msm DP driver. It also contains Makefile and Kconfig changes to compile msm DP driver.
The block diagram of DP driver is shown below:
+-------------+
|DRM FRAMEWORK|
+------+------+
|
+----v----+
| DP DRM |
+----+----+
|
+----v----+
+------------+| DP +----------++------+
+ +---+| DISPLAY |+---+ | |
| + +-+-----+-+ | | |
| | | | | | |
| | | | | | |
| | | | | | |
v v v v v v v
+------+ +------+ +---+ +----+ +----+ +---+ +-----+
| DP | | DP | |DP | | DP | | DP | |DP | | DP |
|PARSER| | HPD | |AUX| |LINK| |CTRL| |PHY| |POWER|
+--+---+ +---+--+ +---+ +----+ +--+-+ +-+-+ +-----+
| | |
+--v---+ +v-----v+
|DEVICE| | DP |
| TREE | |CATALOG|
+------+ +---+---+
|
+---v----+
|CTRL/PHY|
| HW |
+--------+Changes in v12:
-- Add support of pm ops in display port driver -- Clear bpp depth bits before writing to MISC register -- Fix edid read
Previous change log:
https://lkml.kernel.org/lkml/[email protected]/
Chandan Uddaraju (4):
dt-bindings: msm/dp: add bindings of DP/DP-PLL driver for Snapdragon
drm: add constant N value in helper file
drm/msm/dp: add displayPort driver support
drm/msm/dp: add support for DP PLL driver
Jeykumar Sankaran (1):
drm/msm/dpu: add display port support in DPU
Tanmay Shah (1):
drm/msm/dp: Add Display Port HPD feature
drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/msm/Kconfig | 9 + drivers/gpu/drm/msm/Makefile | 14 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 83 +- drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++++ drivers/gpu/drm/msm/dp/dp_aux.h | 30 + drivers/gpu/drm/msm/dp/dp_catalog.c | 1045 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 105 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1693 +++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 35 + drivers/gpu/drm/msm/dp/dp_display.c | 1046 ++++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 31 + drivers/gpu/drm/msm/dp/dp_drm.c | 168 ++ drivers/gpu/drm/msm/dp/dp_drm.h | 18 + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + drivers/gpu/drm/msm/dp/dp_hpd.h | 79 + drivers/gpu/drm/msm/dp/dp_link.c | 1214 ++++++++++++ drivers/gpu/drm/msm/dp/dp_link.h | 132 ++ drivers/gpu/drm/msm/dp/dp_panel.c | 486 +++++ drivers/gpu/drm/msm/dp/dp_panel.h | 95 + drivers/gpu/drm/msm/dp/dp_parser.c | 267 +++ drivers/gpu/drm/msm/dp/dp_parser.h | 138 ++ drivers/gpu/drm/msm/dp/dp_pll.c | 99 + drivers/gpu/drm/msm/dp/dp_pll.h | 61 + drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 +++++++++ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 + drivers/gpu/drm/msm/dp/dp_power.c | 373 ++++ drivers/gpu/drm/msm/dp/dp_power.h | 103 + drivers/gpu/drm/msm/dp/dp_reg.h | 518 +++++ drivers/gpu/drm/msm/msm_drv.c | 2 + drivers/gpu/drm/msm/msm_drv.h | 59 +- include/drm/drm_dp_helper.h | 1 + 34 files changed, 9545 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.h
base-commit: d012a7190fc1fd72ed48911e77ca97ba4521bccd
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v12 1/5 drm: add constant N value in helper file
From: Chandan Uddaraju <[email protected]>
The constant N value (0x8000) is used by i915 DP driver. Define this value in dp helper header file to use in multiple Display Port drivers. Change i915 driver accordingly.
Change in v6: Change commit message
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- include/drm/drm_dp_helper.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -8114,7 +8114,7 @@ static void compute_m_n(unsigned int m, unsigned int n,* which the devices expect also in synchronous clock mode. */ if (constant_n) - *ret_n =0x8000 ; + *ret_n =DP_LINK_CONSTANT_N_VALUE ;else *ret_n = min_t(unsigned int, roundup_pow_of_two(n), DATA_LINK_N_MAX);
include/drm/drm_dp_helper.h +1 -0
@@ -1134,6 +1134,7 @@#define DP_MST_PHYSICAL_PORT_0 0#define DP_MST_LOGICAL_PORT_0 8 +#define DP_LINK_CONSTANT_N_VALUE 0x8000#define DP_LINK_STATUS_SIZE 6bool drm_dp_channel_eq_ok (const u8 link_status[DP_LINK_STATUS_SIZE ],int lane_count);
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 2/5 drm/msm/dp: add displayPort driver support
In reply to Tanmay ShahFrom: Chandan Uddaraju <[email protected]>
Add the needed displayPort files to enable DP driver on msm target.
"dp_display" module is the main module that calls into other sub-modules. "dp_drm" file represents the interface between DRM framework and DP driver.
Changes in v12:
-- Add support of pm ops in display port driver -- Clear bpp depth bits before writing to MISC register -- Fix edid read
Previous Change log:
https://lkml.kernel.org/lkml/[email protected]/
--- drivers/gpu/drm/msm/Kconfig | 8 + drivers/gpu/drm/msm/Makefile | 12 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 19 + .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 + drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++++ drivers/gpu/drm/msm/dp/dp_aux.h | 30 + drivers/gpu/drm/msm/dp/dp_catalog.c | 1019 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 102 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1694 +++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 35 + drivers/gpu/drm/msm/dp/dp_display.c | 936 +++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 28 + drivers/gpu/drm/msm/dp/dp_drm.c | 168 ++ drivers/gpu/drm/msm/dp/dp_drm.h | 18 + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + drivers/gpu/drm/msm/dp/dp_hpd.h | 79 + drivers/gpu/drm/msm/dp/dp_link.c | 1214 ++++++++++++ drivers/gpu/drm/msm/dp/dp_link.h | 132 ++ drivers/gpu/drm/msm/dp/dp_panel.c | 486 +++++ drivers/gpu/drm/msm/dp/dp_panel.h | 95 + drivers/gpu/drm/msm/dp/dp_parser.c | 265 +++ drivers/gpu/drm/msm/dp/dp_parser.h | 139 ++ drivers/gpu/drm/msm/dp/dp_power.c | 363 ++++ drivers/gpu/drm/msm/dp/dp_power.h | 65 + drivers/gpu/drm/msm/dp/dp_reg.h | 490 +++++ drivers/gpu/drm/msm/msm_drv.c | 2 + drivers/gpu/drm/msm/msm_drv.h | 53 +- 27 files changed, 8061 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.h
drivers/gpu/drm/msm/Kconfig +8 -0
@@ -57,6 +57,14 @@ config DRM_MSM_HDMI_HDCP help Choose this option to enable HDCP state machine +config DRM_MSM_DP + bool "Enable DisplayPort support in MSM DRM driver" + depends on DRM_MSM + help + Compile in support for DP driver in MSM DRM driver. DP external + display support is enabled through this config option. It can + be primary or secondary display on device. + config DRM_MSM_DSI bool "Enable DSI support in MSM DRM driver" depends on DRM_MSM
drivers/gpu/drm/msm/Makefile +12 -0
@@ -2,6 +2,7 @@ ccflags-y := -I $(srctree)/$(src) ccflags-y += -I $(srctree)/$(src)/disp/dpu1 ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi +ccflags-$(CONFIG_DRM_MSM_DP) += -I $(srctree)/$(src)/dp msm-y := \ adreno/adreno_device.o \
@@ -99,6 +100,17 @@ msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o msm-$(CONFIG_DRM_MSM_GPU_STATE) += adreno/a6xx_gpu_state.o +msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ + dp/dp_catalog.o \ + dp/dp_ctrl.o \ + dp/dp_display.o \ + dp/dp_drm.o \ + dp/dp_hpd.o \ + dp/dp_link.o \ + dp/dp_panel.o \ + dp/dp_parser.o \ + dp/dp_power.o + msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +19 -0
@@ -995,6 +995,9 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,trace_dpu_enc_mode_set (DRMID (drm_enc)); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) +msm_dp_display_mode_set (priv->dp, drm_enc, mode, adj_mode); +list_for_each_entry (conn_iter, connector_list, head)if (conn_iter->encoder == drm_enc) conn = conn_iter;
@@ -1140,6 +1143,7 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc) {struct dpu_encoder_virt *dpu_enc =NULL ;int ret =0 ; +struct msm_drm_private *priv;struct drm_display_mode *cur_mode =NULL ;if (!drm_enc) {
@@ -1150,6 +1154,7 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)mutex_lock (&dpu_enc->enc_lock); cur_mode = &dpu_enc->base.crtc->state->adjusted_mode; + priv = drm_enc->dev->dev_private;trace_dpu_enc_enable (DRMID (drm_enc), cur_mode->hdisplay, cur_mode->vdisplay);
@@ -1170,6 +1175,15 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)_dpu_encoder_virt_enable_helper (drm_enc); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { + ret =msm_dp_display_enable (priv->dp, + drm_enc); +if (ret) { +DPU_ERROR_ENC (dpu_enc,"dp display enable failed: %d\n" , + ret); + goto out; + } + } dpu_enc->enabled = true; out:
@@ -1232,6 +1246,11 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)dpu_rm_release (global_state, drm_enc); +if (drm_enc->encoder_type ==DRM_MODE_ENCODER_TMDS && priv->dp) { +if (msm_dp_display_disable (priv->dp, drm_enc)) +DPU_ERROR_ENC (dpu_enc,"dp display disable failed\n" ); + } +mutex_unlock (&dpu_enc->enc_lock); }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +8 -0
@@ -100,6 +100,14 @@ static void drm_mode_to_intf_timing_params(* display_v_end -= mode->hsync_start - mode->hdisplay; * } */ +/* for DP/EDP, Shift timings to align it to bottom right */ +if ((phys_enc->hw_intf->cap->type ==INTF_DP ) || + (phys_enc->hw_intf->cap->type ==INTF_EDP )) { + timing->h_back_porch += timing->h_front_porch; + timing->h_front_porch =0 ; + timing->v_back_porch += timing->v_front_porch; + timing->v_front_porch =0 ; + } }static u32 get_horizontal_total (const struct intf_timing_params *timing)
drivers/gpu/drm/msm/dp/dp_aux.c new file +535 -0
535 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_aux.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. +*/ + +#ifndef _DP_AUX_H_ +#define _DP_AUX_H_ + +#include "dp_catalog.h" +#include <drm/drm_dp_helper.h> + +#define DP_AUX_ERR_NONE 0 +#define DP_AUX_ERR_ADDR -1 +#define DP_AUX_ERR_TOUT -2 +#define DP_AUX_ERR_NACK -3 +#define DP_AUX_ERR_DEFER -4 +#define DP_AUX_ERR_NACK_DEFER -5 +#define DP_AUX_ERR_PHY -6 + +int dp_aux_register (struct drm_dp_aux *dp_aux); +void dp_aux_unregister (struct drm_dp_aux *dp_aux); +void dp_aux_isr (struct drm_dp_aux *dp_aux); +void dp_aux_init (struct drm_dp_aux *dp_aux); +void dp_aux_deinit (struct drm_dp_aux *dp_aux); +void dp_aux_reconfig (struct drm_dp_aux *dp_aux); + +struct drm_dp_aux *dp_aux_get (struct device *dev,struct dp_catalog *catalog); +void dp_aux_put (struct drm_dp_aux *aux); + +#endif /*__DP_AUX_H_*/
drivers/gpu/drm/msm/dp/dp_catalog.c new file +1019 -0
1,019 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h new file +102 -0
102 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.c new file +1694 -0
1,213 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.h new file +35 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/dp/dp_display.c new file +936 -0
936 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_display.h new file +28 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/dp/dp_drm.c new file +168 -0
168 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_drm.h new file +18 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/msm/dp/dp_hpd.c new file +69 -0
69 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_hpd.h new file +79 -0
79 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_link.c new file +1214 -0
1,214 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_link.h new file +132 -0
132 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_panel.c new file +486 -0
486 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_panel.h new file +95 -0
95 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_parser.c new file +265 -0
265 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_parser.h new file +139 -0
139 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.c new file +363 -0
363 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.h new file +65 -0
65 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_reg.h new file +490 -0
490 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +50 -3
53 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Part of the diff is not shown here. View the raw message.
PATCH v12 3/5 drm/msm/dp: add support for DP PLL driver
In reply to Tanmay ShahFrom: Chandan Uddaraju <[email protected]>
Add the needed DP PLL specific files to support
display port interface on msm targets.
The DP driver calls the DP PLL driver registration. The DP driver sets the link and pixel clock sources.
Changes in v2:
-- Update copyright markings on all relevant files. -- Use DRM_DEBUG_DP for debug msgs.
Changes in v4:
-- Update the DP link clock provider names
Changes in V5:
-- Addressed comments from Stephen Boyd, Rob clark.
Changes in V6:
-- Remove PLL as separate driver and include PLL as DP module -- Remove redundant clock parsing from PLL module and make DP as
clock provider
-- Map USB3 DPCOM and PHY IO using hardcoded register address and
move mapping form parser to PLL module
-- Access DP PHY modules from same base address using offsets instead of
deriving base address of individual module from device tree.
-- Remove dp_pll_10nm_util.c and include its functionality in
dp_pll_10nm.c
-- Introduce new data structures private to PLL module
Changes in v7:
-- Remove DRM_MSM_DP_PLL config from Makefile and Kconfig -- Remove set_parent from determin_rate API
-- Remove phy_pll_vco_div_clk from parent list -- Remove flag CLK_DIVIDER_ONE_BASED
-- Remove redundant cell-index property parsing
Changes in v8:
-- Unregister hardware clocks during driver cleanup
Changes in v9:
-- Remove redundant Kconfig option DRM_MSM_DP_10NM_PLL
Changes in v10:
-- Limit 10nm PLL function scope
--- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 4 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 31 +- drivers/gpu/drm/msm/dp/dp_display.c | 18 +- drivers/gpu/drm/msm/dp/dp_display.h | 3 + drivers/gpu/drm/msm/dp/dp_parser.c | 2 + drivers/gpu/drm/msm/dp/dp_parser.h | 7 +- drivers/gpu/drm/msm/dp/dp_pll.c | 99 +++ drivers/gpu/drm/msm/dp/dp_pll.h | 61 ++ drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 ++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 +++ drivers/gpu/drm/msm/dp/dp_power.c | 10 + drivers/gpu/drm/msm/dp/dp_power.h | 40 +- drivers/gpu/drm/msm/dp/dp_reg.h | 16 + 14 files changed, 1294 insertions(+), 17 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -60,6 +60,7 @@ config DRM_MSM_HDMI_HDCP config DRM_MSM_DP bool "Enable DisplayPort support in MSM DRM driver" depends on DRM_MSM + default y help Compile in support for DP driver in MSM DRM driver. DP external display support is enabled through this config option. It can
drivers/gpu/drm/msm/Makefile +3 -1
@@ -109,7 +109,9 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_link.o \ dp/dp_panel.o \ dp/dp_parser.o \ - dp/dp_power.o + dp/dp_power.o \ + dp/dp_pll.o \ + dp/dp_pll_10nm.o msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o
drivers/gpu/drm/msm/dp/dp_catalog.c +21 -10
@@ -5,6 +5,7 @@#define pr_fmt (fmt) "[drm-dp] %s: " fmt, __func__ +#include <linux/rational.h> #include <linux/delay.h> #include <linux/iopoll.h> #include <linux/rational.h>
@@ -131,51 +132,58 @@ static inline void dp_write_ahb(struct dp_catalog_private *catalog,static inline void dp_write_phy (struct dp_catalog_private *catalog,u32 offset,u32 data) { + offset +=DP_PHY_REG_OFFSET ;/* * To make sure phy reg writes happens before any other operation, * this function uses writel() instread of writel_relaxed() */ -writel (data, catalog->io->phy_io.base + offset); +writel (data, catalog->io->phy_reg.base + offset); }static inline u32 dp_read_phy (struct dp_catalog_private *catalog,u32 offset) { + offset +=DP_PHY_REG_OFFSET ;/* * To make sure phy reg writes happens before any other operation, * this function uses writel() instread of writel_relaxed() */ -return readl_relaxed (catalog->io->phy_io.base + offset); +return readl_relaxed (catalog->io->phy_reg.base + offset); }static inline void dp_write_pll (struct dp_catalog_private *catalog,u32 offset,u32 data) { -writel_relaxed (data, catalog->io->dp_pll_io.base + offset); + offset +=DP_PHY_PLL_OFFSET ; +writel_relaxed (data, catalog->io->phy_reg.base + offset); }static inline void dp_write_ln_tx0 (struct dp_catalog_private *catalog,u32 offset,u32 data) { -writel_relaxed (data, catalog->io->ln_tx0_io.base + offset); + offset +=DP_PHY_LN_TX0_OFFSET ; +writel_relaxed (data, catalog->io->phy_reg.base + offset); }static inline void dp_write_ln_tx1 (struct dp_catalog_private *catalog,u32 offset,u32 data) { -writel_relaxed (data, catalog->io->ln_tx1_io.base + offset); + offset +=DP_PHY_LN_TX1_OFFSET ; +writel_relaxed (data, catalog->io->phy_reg.base + offset); }static inline u32 dp_read_ln_tx0 (struct dp_catalog_private *catalog,u32 offset) { -return readl_relaxed (catalog->io->ln_tx0_io.base + offset); + offset +=DP_PHY_LN_TX0_OFFSET ; +return readl_relaxed (catalog->io->phy_reg.base + offset); }static inline u32 dp_read_ln_tx1 (struct dp_catalog_private *catalog,u32 offset) { -return readl_relaxed (catalog->io->ln_tx1_io.base + offset); + offset +=DP_PHY_LN_TX1_OFFSET ; +return readl_relaxed (catalog->io->phy_reg.base + offset); } static inline void dp_write_usb_cm(struct dp_catalog_private *catalog,
@@ -398,13 +406,16 @@ void dp_catalog_dump_regs(struct dp_catalog *dp_catalog)dump_regs (catalog->io->usb3_dp_com.base, catalog->io->usb3_dp_com.len);pr_info ("LN TX0 regs\n" ); -dump_regs (catalog->io->ln_tx0_io.base, catalog->io->ln_tx0_io.len); +dump_regs (catalog->io->phy_reg.base +DP_PHY_LN_TX0_OFFSET , +DP_PHY_LN_TX0_SIZE );pr_info ("LN TX1 regs\n" ); -dump_regs (catalog->io->ln_tx1_io.base, catalog->io->ln_tx1_io.len); +dump_regs (catalog->io->phy_reg.base +DP_PHY_LN_TX1_OFFSET , +DP_PHY_LN_TX1_SIZE );pr_info ("DP PHY regs\n" ); -dump_regs (catalog->io->phy_io.base, catalog->io->phy_io.len); +dump_regs (catalog->io->phy_reg.base +DP_PHY_REG_OFFSET , +DP_PHY_REG_SIZE ); }void dp_catalog_aux_setup (struct dp_catalog *dp_catalog)
drivers/gpu/drm/msm/dp/dp_display.c +17 -1
@@ -22,6 +22,7 @@#include "dp_ctrl.h" #include "dp_display.h" #include "dp_drm.h" +#include "dp_pll.h" static struct msm_dp *g_dp_display;#define HPD_STRING_SIZE 30
@@ -42,6 +43,7 @@ struct dp_display_private {struct dp_usbpd *usbpd;struct dp_parser *parser; +struct msm_dp_pll *pll;struct dp_power *power;struct dp_catalog *catalog;struct drm_dp_aux *aux;
@@ -232,7 +234,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) edid = dp->panel->edid; dp->audio_supported =drm_detect_monitor_audio (edid); -dp_panel_handle_sink_request (dp->panel); dp->dp_display.max_pclk_khz =DP_MAX_PIXEL_CLK_KHZ ;
@@ -410,6 +411,7 @@ static void dp_display_deinit_sub_modules(struct dp_display_private *dp)dp_ctrl_put (dp->ctrl);dp_panel_put (dp->panel);dp_aux_put (dp->aux); +dp_pll_put (dp->pll); }static int dp_init_sub_modules (struct dp_display_private *dp)
@@ -420,6 +422,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp)struct dp_panel_in panel_in = { .dev = dev, }; +struct dp_pll_in pll_in = { + .pdev = dp->pdev, + };/* Callback APIs used for cable status change event */ cb->configure = dp_display_usbpd_configure_cb;
@@ -450,6 +455,17 @@ static int dp_init_sub_modules(struct dp_display_private *dp) goto error; } + pll_in.parser = dp->parser; + dp->pll =dp_pll_get (&pll_in); +if (IS_ERR_OR_NULL (dp->pll)) { + rc = -EINVAL ; +DRM_ERROR ("failed to initialize pll, rc = %d\n" , rc); + dp->pll =NULL ; + goto error; + } + + dp->parser->pll = dp->pll; + dp->power =dp_power_get (dp->parser);if (IS_ERR (dp->power)) { rc =PTR_ERR (dp->power);
drivers/gpu/drm/msm/dp/dp_display.h +3 -0
@@ -25,4 +25,7 @@ int dp_display_request_irq(struct msm_dp *dp_display);bool dp_display_check_video_test (struct msm_dp *dp_display);int dp_display_get_test_bpp (struct msm_dp *dp_display); +void __init msm_dp_pll_driver_register (void ); +void __exit msm_dp_pll_driver_unregister(void); +#endif /* _DP_DISPLAY_H_ */
drivers/gpu/drm/msm/dp/dp_parser.c +2 -0
@@ -6,6 +6,7 @@#include <linux/of_gpio.h> #include "dp_parser.h" +#include "dp_reg.h" static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { .num =2 ,
@@ -52,6 +53,7 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser)struct dp_io *io = &parser->io;msm_dss_iounmap (&io->dp_controller); +msm_dss_iounmap (&io->phy_reg);msm_dss_iounmap (&io->usb3_dp_com); }
drivers/gpu/drm/msm/dp/dp_parser.h +3 -4
@@ -10,6 +10,7 @@#include "dpu_io_util.h" #include "msm_drv.h" +#include "dp_pll.h" #define DP_LABEL "MDSS DP DISPLAY"#define DP_MAX_PIXEL_CLK_KHZ 675000
@@ -66,10 +67,7 @@ struct dp_display_data {*/ struct dp_io {struct dss_io_data dp_controller; -struct dss_io_data phy_io; -struct dss_io_data ln_tx0_io; -struct dss_io_data ln_tx1_io; -struct dss_io_data dp_pll_io; +struct dss_io_data phy_reg;struct dss_io_data usb3_dp_com; };
@@ -117,6 +115,7 @@ struct dp_parser {struct dp_pinctrl pinctrl;struct dp_io io;struct dp_display_data disp_data; +struct msm_dp_pll *pll;const struct dp_regulator_cfg *regulator_cfg;u32 max_dp_lanes;
drivers/gpu/drm/msm/dp/dp_pll.c new file +99 -0
99 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll.h new file +61 -0
61 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll_10nm.c new file +930 -0
930 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll_private.h new file +89 -0
89 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.c +10 -0
@@ -101,6 +101,16 @@ static int dp_power_clk_init(struct dp_power_private *power) core = &power->parser->mp[DP_CORE_PM ]; ctrl = &power->parser->mp[DP_CTRL_PM ]; +if (power->parser->pll && power->parser->pll->get_provider) { + rc = power->parser->pll->get_provider (power->parser->pll, + &power->link_provider, &power->pixel_provider); +if (rc) { +DRM_ERROR ("%s:provider failed,don't set parent\n" , + __func__); +return 0 ; + } + } + rc =msm_dss_get_clk (dev, core->clk_config, core->num_clk);if (rc) { DRM_ERROR("failed to get %s clk. err=%d\n",
drivers/gpu/drm/msm/dp/dp_power.h +39 -1
@@ -14,7 +14,6 @@* @init: initializes the regulators/core clocks/GPIOs/pinctrl * @deinit: turns off the regulators/core clocks/GPIOs/pinctrl * @clk_enable: enable/disable the DP clocks -* @set_link_clk_parent: set the parent of DP link clock * @set_pixel_clk_parent: set the parent of DP pixel clock */ struct dp_power {
@@ -22,10 +21,49 @@ struct dp_power {bool link_clks_on; }; +/** +* dp_power_init() - enable power supplies for display controller +* +* @power: instance of power module +* @flip: bool for flipping gpio direction +* return: 0 if success or error if failure. +* +* This API will turn on the regulators and configures gpio's +* aux/hpd. +*/ int dp_power_init (struct dp_power *power,bool flip); + +/** +* dp_power_deinit() - turn off regulators and gpios. +* +* @power: instance of power module +* return: 0 for success +* +* This API turns off power and regulators. +*/ int dp_power_deinit (struct dp_power *power); + +/** +* dp_power_clk_enable() - enable display controller clocks +* +* @power: instance of power module +* @pm_type: type of pm, core/ctrl/phy +* @enable: enables or disables +* return: pointer to allocated power module data +* +* This API will call setrate and enable for DP clocks +*/ +int dp_power_clk_enable (struct dp_power *power,enum dp_pm_type pm_type,bool enable); +/** +* dp_power_set_link_clk_parent() - configures parent of link clocks +* +* @power: instance of power module +* return: 0 for success, error for failures +* +* This API will set the link clock parent source +*/ int dp_power_set_link_clk_parent (struct dp_power *power);/**
drivers/gpu/drm/msm/dp/dp_reg.h +16 -0
@@ -6,6 +6,22 @@#ifndef _DP_REG_H_#define _DP_REG_H_ +/* DP PHY Register Regions */ +#define REG_DP_PHY_REGION_BASE (0x088ea000) +#define REG_DP_PHY_REGION_SIZE (0x00000C00) + +#define REG_USB3_DP_COM_REGION_BASE (0x088e8000) +#define REG_USB3_DP_COM_REGION_SIZE (0x00000020) + +#define DP_PHY_PLL_OFFSET (0x00000000) +#define DP_PHY_PLL_SIZE (0x00000200) +#define DP_PHY_REG_OFFSET (0x00000A00) +#define DP_PHY_REG_SIZE (0x00000200) +#define DP_PHY_LN_TX0_OFFSET (0x00000200) +#define DP_PHY_LN_TX0_SIZE (0x00000200) +#define DP_PHY_LN_TX1_OFFSET (0x00000600) +#define DP_PHY_LN_TX1_SIZE (0x00000200) +/* DP_TX Registers */ #define REG_DP_HW_VERSION (0x00000000)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 4/5 drm/msm/dpu: add display port support in DPU
In reply to Tanmay ShahFrom: Jeykumar Sankaran <[email protected]>
Add display port support in DPU by creating hooks
for DP encoder enumeration and encoder mode
initialization.
changes in v2:
- rebase on [2] (Sean Paul)
- remove unwanted error checks and
switch cases (Jordan Crouse)
[1] https://lwn.net/Articles/768265/
[2] https://lkml.org/lkml/2018/11/17/87
changes in V3:
-- Moved this change as part of the DP driver changes. -- Addressed compilation issues on the latest code base.
Changes in v6:
-- Fix checkpatch.pl warning
Changes in v7: Remove depends-on tag from commit message.
Changes in v8: None
Changes in v9: None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 65 +++++++++++++++++---- 2 files changed, 58 insertions(+), 15 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +4 -4
@@ -2025,7 +2025,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, {int ret =0 ;int i =0 ; -enum dpu_intf_type intf_type; +enum dpu_intf_type intf_type =INTF_NONE ;struct dpu_enc_phys_init_params phys_params;if (!dpu_enc) {
@@ -2047,9 +2047,9 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,case DRM_MODE_ENCODER_DSI : intf_type =INTF_DSI ;break ; -default : -DPU_ERROR_ENC (dpu_enc,"unsupported display interface type\n" ); -return -EINVAL ; +case DRM_MODE_ENCODER_TMDS : + intf_type =INTF_DP ; +break ; }WARN_ON (disp_info->num_of_h_tiles <1 );
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +54 -11
85 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 5/5 drm/msm/dp: Add Display Port HPD feature
In reply to Tanmay ShahConfigure HPD registers in DP controller and
enable HPD interrupt.
Add interrupt to handle HPD connect and disconnect events.
Changes in v8: None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 ++++ drivers/gpu/drm/msm/dp/dp_catalog.c | 67 +++++++++------ drivers/gpu/drm/msm/dp/dp_catalog.h | 5 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 108 ++++++++++++++++++++++-- drivers/gpu/drm/msm/dp/dp_reg.h | 12 +++ drivers/gpu/drm/msm/msm_drv.h | 6 ++ 7 files changed, 182 insertions(+), 35 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +18 -0
@@ -752,6 +752,23 @@ static void dpu_irq_preinstall(struct msm_kms *kms)dpu_core_irq_preinstall (dpu_kms); } +static int dpu_irq_postinstall (struct msm_kms *kms) +{ +struct msm_drm_private *priv; +struct dpu_kms *dpu_kms =to_dpu_kms (kms); + +if (!dpu_kms || !dpu_kms->dev) +return -EINVAL ; + + priv = dpu_kms->dev->dev_private; +if (!priv) +return -EINVAL ; + +msm_dp_irq_postinstall (priv->dp); + +return 0 ; +} +static void dpu_irq_uninstall (struct msm_kms *kms) {struct dpu_kms *dpu_kms =to_dpu_kms (kms);
@@ -762,6 +779,7 @@ static void dpu_irq_uninstall(struct msm_kms *kms)static const struct msm_kms_funcs kms_funcs = { .hw_init = dpu_kms_hw_init, .irq_preinstall = dpu_irq_preinstall, + .irq_postinstall = dpu_irq_postinstall, .irq_uninstall = dpu_irq_uninstall, .irq = dpu_irq, .enable_commit = dpu_kms_enable_commit,
drivers/gpu/drm/msm/dp/dp_catalog.c +41 -26
83 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +4 -1
@@ -76,7 +76,10 @@ void dp_catalog_ctrl_reset(struct dp_catalog *dp_catalog);void dp_catalog_ctrl_usb_reset (struct dp_catalog *dp_catalog,bool flip);bool dp_catalog_ctrl_mainlink_ready (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_enable_irq (struct dp_catalog *dp_catalog,bool enable); -void dp_catalog_ctrl_hpd_config (struct dp_catalog *dp_catalog,bool enable); +void dp_catalog_hpd_config_intr (struct dp_catalog *dp_catalog, +u32 intr_mask,bool en); +void dp_catalog_ctrl_hpd_config (struct dp_catalog *dp_catalog); +u32 dp_catalog_hpd_get_intr_status (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_phy_reset (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_phy_lane_cfg (struct dp_catalog *dp_catalog,bool flipped,u8 lane_cnt);
drivers/gpu/drm/msm/dp/dp_ctrl.c +0 -1
@@ -1563,7 +1563,6 @@ int dp_ctrl_on(struct dp_ctrl *dp_ctrl) rate = ctrl->panel->link_info.rate;dp_power_clk_enable (ctrl->power,DP_CORE_PM , true); -dp_catalog_ctrl_hpd_config (ctrl->catalog, true);if (ctrl->link->sink_request &DP_TEST_LINK_PHY_TEST_PATTERN ) {DRM_DEBUG_DP ("using phy test link parameters\n" );
drivers/gpu/drm/msm/dp/dp_display.c +101 -7
162 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_reg.h +12 -0
@@ -54,10 +54,22 @@#define DP_DP_IRQ_HPD_INT_MASK (0x00000002)#define DP_DP_HPD_REPLUG_INT_MASK (0x00000004)#define DP_DP_HPD_UNPLUG_INT_MASK (0x00000008) +#define DP_DP_HPD_INT_MASK (DP_DP_HPD_PLUG_INT_MASK | \ + DP_DP_IRQ_HPD_INT_MASK | \ + DP_DP_HPD_REPLUG_INT_MASK | \ + DP_DP_HPD_UNPLUG_INT_MASK) +#define DP_DP_HPD_STATE_STATUS_CONNECTED (0x40000000) +#define DP_DP_HPD_STATE_STATUS_PENDING (0x20000000) +#define DP_DP_HPD_STATE_STATUS_DISCONNECTED (0x00000000) +#define DP_DP_HPD_STATE_STATUS_MASK (0xE0000000)#define REG_DP_DP_HPD_REFTIMER (0x00000018) +#define DP_DP_HPD_REFTIMER_ENABLE (1 << 16) +#define REG_DP_DP_HPD_EVENT_TIME_0 (0x0000001C)#define REG_DP_DP_HPD_EVENT_TIME_1 (0x00000020) +#define DP_DP_HPD_EVENT_TIME_0_VAL (0x3E800FA) +#define DP_DP_HPD_EVENT_TIME_1_VAL (0x1F407D0)#define REG_DP_AUX_CTRL (0x00000030)#define DP_AUX_CTRL_ENABLE (0x00000001)
drivers/gpu/drm/msm/msm_drv.h +6 -0
@@ -390,6 +390,7 @@ int msm_dp_display_disable(struct msm_dp *dp, struct drm_encoder *encoder);void msm_dp_display_mode_set (struct msm_dp *dp,struct drm_encoder *encoder,struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode); +void msm_dp_irq_postinstall (struct msm_dp *dp_display);#else static inline int __init msm_dp_register (void )
@@ -421,6 +422,11 @@ static inline void msm_dp_display_mode_set(struct msm_dp *dp, struct drm_display_mode *adjusted_mode) { } + +static inline void msm_dp_irq_postinstall (struct msm_dp *dp_display) +{ +} +#endif void __init msm_mdp_register (void );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Fyi, I've pushed this series and the dp-compliance bits to msm-next-dp[1]
I didn't include the dp audio series yet, which seems to need some minor rebasing. (And a small request, when resending, cc [email protected], so it shows up in the patchwork instance[2] I use)
You might want to double check that I got the correct versions of the series, etc. And that nothing else (other than audio) is missing.
BR,
-R
[1] https://gitlab.freedesktop.org/drm/msm/-/commits/msm-next-dp
[2] https://patchwork.freedesktop.org/project/freedreno
Quoted 122 lines · Tanmay Shah
These patches add Display-Port driver on SnapDragon/msm hardware. This series also contains device-tree bindings for msm DP driver. It also contains
MakefileandKconfigchanges to compile msm DP driver.The block diagram of DP driver is shown below:
+-------------+ |DRM FRAMEWORK| +------+------+ | +----v----+ | DP DRM | +----+----+ | +----v----+ +------------+| DP +----------++------+ + +---+| DISPLAY |+---+ | | | + +-+-----+-+ | | | | | | | | | | | | | | | | | | | | | | | | v v v v v v v +------+ +------+ +---+ +----+ +----+ +---+ +-----+ | DP | | DP | |DP | | DP | | DP | |DP | | DP | |PARSER| | HPD | |AUX| |LINK| |CTRL| |PHY| |POWER| +--+---+ +---+--+ +---+ +----+ +--+-+ +-+-+ +-----+ | | | +--v---+ +v-----v+ |DEVICE| | DP | | TREE | |CATALOG| +------+ +---+---+ | +---v----+ |CTRL/PHY| | HW | +--------+Changes in v12:
-- Add support of pm ops in display port driver -- Clear bpp depth bits before writing to MISC register -- Fix edid read
Previous change log:
https://lkml.kernel.org/lkml/[email protected]/Chandan Uddaraju (4):
dt-bindings: msm/dp: add bindings of DP/DP-PLL driver for Snapdragon
drm: add constant N value in helper file
drm/msm/dp: add displayPort driver support
drm/msm/dp: add support for DP PLL driverJeykumar Sankaran (1):
drm/msm/dpu: add display port support in DPUTanmay Shah (1):
drm/msm/dp: Add Display Port HPD featuredrivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/msm/Kconfig | 9 + drivers/gpu/drm/msm/Makefile | 14 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 83 +- drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++++ drivers/gpu/drm/msm/dp/dp_aux.h | 30 + drivers/gpu/drm/msm/dp/dp_catalog.c | 1045 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 105 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1693 +++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 35 + drivers/gpu/drm/msm/dp/dp_display.c | 1046 ++++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 31 + drivers/gpu/drm/msm/dp/dp_drm.c | 168 ++ drivers/gpu/drm/msm/dp/dp_drm.h | 18 + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + drivers/gpu/drm/msm/dp/dp_hpd.h | 79 + drivers/gpu/drm/msm/dp/dp_link.c | 1214 ++++++++++++ drivers/gpu/drm/msm/dp/dp_link.h | 132 ++ drivers/gpu/drm/msm/dp/dp_panel.c | 486 +++++ drivers/gpu/drm/msm/dp/dp_panel.h | 95 + drivers/gpu/drm/msm/dp/dp_parser.c | 267 +++ drivers/gpu/drm/msm/dp/dp_parser.h | 138 ++ drivers/gpu/drm/msm/dp/dp_pll.c | 99 + drivers/gpu/drm/msm/dp/dp_pll.h | 61 + drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 +++++++++ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 + drivers/gpu/drm/msm/dp/dp_power.c | 373 ++++ drivers/gpu/drm/msm/dp/dp_power.h | 103 + drivers/gpu/drm/msm/dp/dp_reg.h | 518 +++++ drivers/gpu/drm/msm/msm_drv.c | 2 + drivers/gpu/drm/msm/msm_drv.h | 59 +- include/drm/drm_dp_helper.h | 1 + 34 files changed, 9545 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.h
Quoted 5 lines
base-commit:
d012a7190fc1fd72ed48911e77ca97ba4521bccd
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thanks Rob for pushing the changes. I confirm that the versions which you have pushed are the latest ones.
I have rebased audio changes on top of the latest DP changes
and posted them here https://patchwork.freedesktop.org/series/81612/.
The other DP change which is missing is the video pattern CTS change https://patchwork.freedesktop.org/series/81614/ which also I have now rebased on top of the latest DP patch series and posted.
Thanks
Abhinav
Quoted 145 lines · Rob Clark
Fyi, I've pushed this series and the dp-compliance bits to msm-next-dp[1]
I didn't include the dp audio series yet, which seems to need some minor rebasing. (And a small request, when resending, cc [email protected], so it shows up in the patchwork instance[2] I use)
You might want to double check that I got the correct versions of the series, etc. And that nothing else (other than audio) is missing.
BR,
-R[1] https://gitlab.freedesktop.org/drm/msm/-/commits/msm-next-dp
[2] https://patchwork.freedesktop.org/project/freedrenoQuoted 128 lines · Tanmay Shah
These patches add Display-Port driver on SnapDragon/msm hardware. This series also contains device-tree bindings for msm DP driver. It also contains
MakefileandKconfigchanges to compile msm DP driver.The block diagram of DP driver is shown below:
+-------------+ |DRM FRAMEWORK| +------+------+ | +----v----+ | DP DRM | +----+----+ | +----v----+ +------------+| DP +----------++------+ + +---+| DISPLAY |+---+ | | | + +-+-----+-+ | | | | | | | | | | | | | | | | | | | | | | | | v v v v v v v +------+ +------+ +---+ +----+ +----+ +---+ +-----+ | DP | | DP | |DP | | DP | | DP | |DP | | DP | |PARSER| | HPD | |AUX| |LINK| |CTRL| |PHY| |POWER| +--+---+ +---+--+ +---+ +----+ +--+-+ +-+-+ +-----+ | | | +--v---+ +v-----v+ |DEVICE| | DP | | TREE | |CATALOG| +------+ +---+---+ | +---v----+ |CTRL/PHY| | HW | +--------+Changes in v12:
-- Add support of pm ops in display port driver -- Clear bpp depth bits before writing to MISC register -- Fix edid read
Previous change log:
https://lkml.kernel.org/lkml/[email protected]/Chandan Uddaraju (4):
dt-bindings: msm/dp: add bindings of DP/DP-PLL driver for Snapdragon
drm: add constant N value in helper file
drm/msm/dp: add displayPort driver support
drm/msm/dp: add support for DP PLL driverJeykumar Sankaran (1):
drm/msm/dpu: add display port support in DPUTanmay Shah (1):
drm/msm/dp: Add Display Port HPD featuredrivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/msm/Kconfig | 9 + drivers/gpu/drm/msm/Makefile | 14 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 83 +- drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++++ drivers/gpu/drm/msm/dp/dp_aux.h | 30 + drivers/gpu/drm/msm/dp/dp_catalog.c | 1045 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 105 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1693 +++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 35 + drivers/gpu/drm/msm/dp/dp_display.c | 1046 ++++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 31 + drivers/gpu/drm/msm/dp/dp_drm.c | 168 ++ drivers/gpu/drm/msm/dp/dp_drm.h | 18 + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + drivers/gpu/drm/msm/dp/dp_hpd.h | 79 + drivers/gpu/drm/msm/dp/dp_link.c | 1214 ++++++++++++ drivers/gpu/drm/msm/dp/dp_link.h | 132 ++ drivers/gpu/drm/msm/dp/dp_panel.c | 486 +++++ drivers/gpu/drm/msm/dp/dp_panel.h | 95 + drivers/gpu/drm/msm/dp/dp_parser.c | 267 +++ drivers/gpu/drm/msm/dp/dp_parser.h | 138 ++ drivers/gpu/drm/msm/dp/dp_pll.c | 99 + drivers/gpu/drm/msm/dp/dp_pll.h | 61 + drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 +++++++++ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 + drivers/gpu/drm/msm/dp/dp_power.c | 373 ++++ drivers/gpu/drm/msm/dp/dp_power.h | 103 + drivers/gpu/drm/msm/dp/dp_reg.h | 518 +++++ drivers/gpu/drm/msm/msm_drv.c | 2 + drivers/gpu/drm/msm/msm_drv.h | 59 +- include/drm/drm_dp_helper.h | 1 + 34 files changed, 9545 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.hbase-commit:
d012a7190fc1fd72ed48911e77ca97ba4521bccd
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 10 lines · Rob Clark
Fyi, I've pushed this series and the dp-compliance bits to msm-next-dp[1]
I didn't include the dp audio series yet, which seems to need some minor rebasing. (And a small request, when resending, cc [email protected], so it shows up in the patchwork instance[2] I use)
You might want to double check that I got the correct versions of the series, etc. And that nothing else (other than audio) is missing.
Thanks Rob for pulling changes in msm-next-dp branch.
I confirm that changes you pointed above are latest changes and nothing else is missing in driver.
Sure, we will make sure to send changes in freedreno list as well.
Thanks.
Quoted 135 lines
BR,
-R[1] https://gitlab.freedesktop.org/drm/msm/-/commits/msm-next-dp
[2] https://patchwork.freedesktop.org/project/freedrenoQuoted 128 lines · Tanmay Shah
These patches add Display-Port driver on SnapDragon/msm hardware. This series also contains device-tree bindings for msm DP driver. It also contains
MakefileandKconfigchanges to compile msm DP driver.The block diagram of DP driver is shown below:
+-------------+ |DRM FRAMEWORK| +------+------+ | +----v----+ | DP DRM | +----+----+ | +----v----+ +------------+| DP +----------++------+ + +---+| DISPLAY |+---+ | | | + +-+-----+-+ | | | | | | | | | | | | | | | | | | | | | | | | v v v v v v v +------+ +------+ +---+ +----+ +----+ +---+ +-----+ | DP | | DP | |DP | | DP | | DP | |DP | | DP | |PARSER| | HPD | |AUX| |LINK| |CTRL| |PHY| |POWER| +--+---+ +---+--+ +---+ +----+ +--+-+ +-+-+ +-----+ | | | +--v---+ +v-----v+ |DEVICE| | DP | | TREE | |CATALOG| +------+ +---+---+ | +---v----+ |CTRL/PHY| | HW | +--------+Changes in v12:
-- Add support of pm ops in display port driver -- Clear bpp depth bits before writing to MISC register -- Fix edid read
Previous change log:
https://lkml.kernel.org/lkml/[email protected]/Chandan Uddaraju (4):
dt-bindings: msm/dp: add bindings of DP/DP-PLL driver for Snapdragon
drm: add constant N value in helper file
drm/msm/dp: add displayPort driver support
drm/msm/dp: add support for DP PLL driverJeykumar Sankaran (1):
drm/msm/dpu: add display port support in DPUTanmay Shah (1):
drm/msm/dp: Add Display Port HPD featuredrivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/msm/Kconfig | 9 + drivers/gpu/drm/msm/Makefile | 14 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 27 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 83 +- drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++++ drivers/gpu/drm/msm/dp/dp_aux.h | 30 + drivers/gpu/drm/msm/dp/dp_catalog.c | 1045 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 105 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1693 +++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 35 + drivers/gpu/drm/msm/dp/dp_display.c | 1046 ++++++++++ drivers/gpu/drm/msm/dp/dp_display.h | 31 + drivers/gpu/drm/msm/dp/dp_drm.c | 168 ++ drivers/gpu/drm/msm/dp/dp_drm.h | 18 + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + drivers/gpu/drm/msm/dp/dp_hpd.h | 79 + drivers/gpu/drm/msm/dp/dp_link.c | 1214 ++++++++++++ drivers/gpu/drm/msm/dp/dp_link.h | 132 ++ drivers/gpu/drm/msm/dp/dp_panel.c | 486 +++++ drivers/gpu/drm/msm/dp/dp_panel.h | 95 + drivers/gpu/drm/msm/dp/dp_parser.c | 267 +++ drivers/gpu/drm/msm/dp/dp_parser.h | 138 ++ drivers/gpu/drm/msm/dp/dp_pll.c | 99 + drivers/gpu/drm/msm/dp/dp_pll.h | 61 + drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 +++++++++ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 + drivers/gpu/drm/msm/dp/dp_power.c | 373 ++++ drivers/gpu/drm/msm/dp/dp_power.h | 103 + drivers/gpu/drm/msm/dp/dp_reg.h | 518 +++++ drivers/gpu/drm/msm/msm_drv.c | 2 + drivers/gpu/drm/msm/msm_drv.h | 59 +- include/drm/drm_dp_helper.h | 1 + 34 files changed, 9545 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.hbase-commit:
d012a7190fc1fd72ed48911e77ca97ba4521bccd
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel