drm/msm: Misc patches
Subsystems (5)
v2 cover drm/msm: Misc patches
These are mainly small fixes in drm/msm. The last patch adds a way to parse DSI lanes information via DT.
Changes in v2:
- Updated the patch VDD regulator patch for MSM8916. After studying schematics and looking at DSI specs again carefully, we realized that the vdd supply is meant for the panels that connect to the dsi host. The downstream driver controlled it within the DSI driver itself, which led to the confusion.
- Updated the DT bindings for parsing DSI data lanes
- Added a patch to constify iommu port names
- Fixed some checkpatch warnings.
Archit Taneja (5):
drm/msm/mdp: Use atomic helper to set crtc property drm/msm: Free fb helper resources in msm_unload drm/msm/dsi: Remove incorrect warning on host attach drm/msm/dsi: Drop VDD regulator for MSM8916 drm/msm/dsi: Parse DSI lanes via DT
Rob Clark (1):
drm/msm: make iommu port names const'ier
Sricharan R (1):
drm/msm/mdp: Detach iommu in mdp4_destroy
.../devicetree/bindings/display/msm/dsi.txt | 32 +++++- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 118 +++++++++++++++++---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 17 ++- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 9 +- drivers/gpu/drm/msm/msm_drv.c | 5 + drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_iommu.c | 6 +- drivers/gpu/drm/msm/msm_mmu.h | 4 +- 11 files changed, 154 insertions(+), 51 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/7 drm/msm/mdp: Use atomic helper to set crtc property
Assign drm_atomic_helper_crtc_set_property helper to MDP4 and MDP5 crtcs' set_property ops. This replaces the custom funcs that returned an error even for standard crtc properties.
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 +-------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +1 -8
@@ -361,13 +361,6 @@ static void mdp4_crtc_atomic_flush(struct drm_crtc *crtc,request_pending (crtc,PENDING_FLIP ); } -static int mdp4_crtc_set_property (struct drm_crtc *crtc, -struct drm_property *property,uint64_t val) -{ -// XXX -return -EINVAL ; -} -#define CURSOR_WIDTH 64#define CURSOR_HEIGHT 64
@@ -499,7 +492,7 @@ static const struct drm_crtc_funcs mdp4_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = mdp4_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, - .set_property = mdp4_crtc_set_property, + .set_property = drm_atomic_helper_crtc_set_property, .cursor_set = mdp4_crtc_cursor_set, .cursor_move = mdp4_crtc_cursor_move, .reset = drm_atomic_helper_crtc_reset,
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +1 -8
@@ -468,13 +468,6 @@ static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc,request_pending (crtc,PENDING_FLIP ); } -static int mdp5_crtc_set_property (struct drm_crtc *crtc, -struct drm_property *property,uint64_t val) -{ -// XXX -return -EINVAL ; -} -static void get_roi (struct drm_crtc *crtc,uint32_t *roi_w,uint32_t *roi_h) {struct mdp5_crtc *mdp5_crtc =to_mdp5_crtc (crtc);
@@ -625,7 +618,7 @@ static const struct drm_crtc_funcs mdp5_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = mdp5_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, - .set_property = mdp5_crtc_set_property, + .set_property = drm_atomic_helper_crtc_set_property, .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/7 drm/msm: make iommu port names const'ier
In reply to Archit TanejaFrom: Rob Clark <[email protected]>
--- drivers/gpu/drm/msm/msm_iommu.c | 6 ++++-- drivers/gpu/drm/msm/msm_mmu.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/msm_iommu.c +4 -2
@@ -31,13 +31,15 @@ static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,return 0 ; } -static int msm_iommu_attach (struct msm_mmu *mmu,const char **names,int cnt) +static int msm_iommu_attach (struct msm_mmu *mmu,const char *const *names, +int cnt) {struct msm_iommu *iommu =to_msm_iommu (mmu);return iommu_attach_device (iommu->domain, mmu->dev); } -static void msm_iommu_detach (struct msm_mmu *mmu,const char **names,int cnt) +static void msm_iommu_detach (struct msm_mmu *mmu,const char *const *names, +int cnt) {struct msm_iommu *iommu =to_msm_iommu (mmu);iommu_detach_device (iommu->domain, mmu->dev);
drivers/gpu/drm/msm/msm_mmu.h +2 -2
@@ -21,8 +21,8 @@#include <linux/iommu.h> struct msm_mmu_funcs { -int (*attach)(struct msm_mmu *mmu,const char **names,int cnt); -void (*detach)(struct msm_mmu *mmu,const char **names,int cnt); +int (*attach)(struct msm_mmu *mmu,const char *const *names,int cnt); +void (*detach)(struct msm_mmu *mmu,const char *const *names,int cnt);int (*map)(struct msm_mmu *mmu,uint32_t iova,struct sg_table *sgt,unsigned len,int prot); int (*unmap)(struct msm_mmu *mmu, uint32_t iova, struct sg_table *sgt,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 3/7 drm/msm/mdp: Detach iommu in mdp4_destroy
In reply to Archit TanejaFrom: Sricharan R <[email protected]>
attach_dev gets called in mdp4_kms_init, but there is no corresponding detach_dev called in the error path or in the kms driver unload path.
Detach and destroy mmu in mdp4_destroy.
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 17 +++++++++++++---- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +13 -4
@@ -179,9 +179,20 @@ static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, } } +static const char *const iommu_ports[] = { +"mdp_port0_cb0" ,"mdp_port1_cb0" , +}; +static void mdp4_destroy (struct msm_kms *kms) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms)); +struct msm_mmu *mmu = mdp4_kms->mmu; + +if (mmu) { + mmu->funcs->detach (mmu, iommu_ports,ARRAY_SIZE (iommu_ports)); + mmu->funcs->destroy (mmu); + } +if (mdp4_kms->blank_cursor_iova)msm_gem_put_iova (mdp4_kms->blank_cursor_bo, mdp4_kms->id);if (mdp4_kms->blank_cursor_bo)
@@ -446,10 +457,6 @@ fail:return ret; } -static const char *iommu_ports[] = { -"mdp_port0_cb0" ,"mdp_port1_cb0" , -}; -struct msm_kms *mdp4_kms_init (struct drm_device *dev) {struct platform_device *pdev = dev->platformdev;
@@ -554,6 +561,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) ARRAY_SIZE(iommu_ports));if (ret) goto fail; + + mdp4_kms->mmu = mmu; }else {dev_info (dev->dev,"no iommu, fallback to phys " "contig buffers for scanout\n" );
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +1 -0
@@ -45,6 +45,7 @@ struct mdp4_kms {struct clk *pclk;struct clk *lut_clk;struct clk *axi_clk; +struct msm_mmu *mmu;struct mdp_irq error_handler;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/7 drm/msm: Free fb helper resources in msm_unload
In reply to Archit TanejaWe have a msm_fbev_free function to uninit fb_helper stuff, but we aren't using it. Call it in msm_unload.
--- drivers/gpu/drm/msm/msm_drv.c | 5 +++++ drivers/gpu/drm/msm/msm_drv.h | 1 + 2 files changed, 6 insertions(+)
drivers/gpu/drm/msm/msm_drv.c +5 -0
@@ -196,6 +196,11 @@ static int msm_unload(struct drm_device *dev) }drm_kms_helper_poll_fini (dev); + +#ifdef CONFIG_DRM_FBDEV_EMULATION +if (fbdev && priv->fbdev) +msm_fbdev_free (dev); +#endif drm_mode_config_cleanup (dev);drm_vblank_cleanup (dev);
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -240,6 +240,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd);struct drm_fb_helper *msm_fbdev_init (struct drm_device *dev); +void msm_fbdev_free (struct drm_device *dev);struct hdmi ; int hdmi_modeset_init(struct hdmi *hdmi, struct drm_device *dev,
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/7 drm/msm/dsi: Remove incorrect warning on host attach
In reply to Archit TanejaWith the implementation of of_graph parsing, it isn't any longer necessary for msm_host->device node to be same as dsi->dev.of_node. This only holds true when the connected device is also a child of the dsi_host.
In the case of external bridge chips belonging to a different control bus, these are guaranteed to be different.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +0 -2
@@ -1484,8 +1484,6 @@ static int dsi_host_attach(struct mipi_dsi_host *host, msm_host->format = dsi->format; msm_host->mode_flags = dsi->mode_flags; -WARN_ON (dsi->dev.of_node != msm_host->device_node); -/* Some gpios defined in panel DT need to be controlled by host */ ret =dsi_host_init_panel_gpios (msm_host, &dsi->dev);if (ret)
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 6/7 drm/msm/dsi: Drop VDD regulator for MSM8916
In reply to Archit TanejaVDD regulator input was specified for MSM8916. It turns our that this regulator is used for the display panels used on MSM8916 platforms, but not the DSI controller itself. Drop this regulator from the list.
--- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_cfg.c +1 -2
@@ -57,10 +57,9 @@ static const char * const dsi_8916_bus_clk_names[] = {static const struct msm_dsi_config msm8916_dsi_cfg = { .io_offset =DSI_6G_REG_SHIFT , .reg_cfg = { - .num =4 , + .num =3 , .regs = { {"gdsc" ,-1 ,-1 ,-1 ,-1 }, - {"vdd" ,2850000 ,2850000 ,100000 ,100 }, {"vdda" ,1200000 ,1200000 ,100000 ,100 }, {"vddio" ,1800000 ,1800000 ,100000 ,100 }, },
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 7/7 drm/msm/dsi: Parse DSI lanes via DT
In reply to Archit TanejaThe DSI driver is currently unaware of how the DSI physical data lanes are mapped to the logical lanes provided by the DSI controller.
Create a DT binding "qcom,data-lane-map" that provides this information on a given platform.
The MSM DSI controller is restricted in terms of what all mappings it can support. The lane polarity is fixed for all the lanes, the clock lanes are fixed, and the data lanes can be swapped among each other only for a few combinations. Apply these restrictions when we parse the DT data.
--- .../devicetree/bindings/display/msm/dsi.txt | 32 +++++- drivers/gpu/drm/msm/dsi/dsi_host.c | 116 +++++++++++++++++---- 2 files changed, 125 insertions(+), 23 deletions(-)
Documentation/devicetree/bindings/display/msm/dsi.txt +29 -3
@@ -44,9 +44,34 @@ Optional properties: - pinctrl-names: the pin control state names; should contain "default" - pinctrl-0: the default pinctrl state (active) - pinctrl-n: the "sleep" pinctrl state -- port: DSI controller output port. This contains one endpoint subnode, with its - remote-endpoint set to the phandle of the connected panel's endpoint. - See Documentation/devicetree/bindings/graph.txt for device graph info. +- port: DSI controller output port, containing one endpoint subnode. + + DSI Endpoint properties: + - remote-endpoint: set to phandle of the connected panel's endpoint. + See Documentation/devicetree/bindings/graph.txt for device graph info. + - qcom,data-lane-map: this describes how the logical DSI lanes are mapped + to the physical lanes on the given platform. The value contained in + index n describes what logical data lane is mapped to the physical data + lane n (DATAn, where n lies between 0 and 3). + + For example: + + qcom,data-lane-map = <3 0 1 2>; + + The above mapping describes that the logical data lane DATA3 is mapped to + the physical data lane DATA0, logical DATA0 to physical DATA1, logic DATA1 + to phys DATA2 and logic DATA2 to phys DATA3. + + There are only a limited number of physical to logical mappings possible: + + "0123": Logic 0->Phys 0; Logic 1->Phys 1; Logic 2->Phys 2; Logic 3->Phys 3; + "3012": Logic 3->Phys 0; Logic 0->Phys 1; Logic 1->Phys 2; Logic 2->Phys 3; + "2301": Logic 2->Phys 0; Logic 3->Phys 1; Logic 0->Phys 2; Logic 1->Phys 3; + "1230": Logic 1->Phys 0; Logic 2->Phys 1; Logic 3->Phys 2; Logic 0->Phys 3; + "0321": Logic 0->Phys 0; Logic 3->Phys 1; Logic 2->Phys 2; Logic 1->Phys 3; + "1032": Logic 1->Phys 0; Logic 0->Phys 1; Logic 3->Phys 2; Logic 2->Phys 3; + "2103": Logic 2->Phys 0; Logic 1->Phys 1; Logic 0->Phys 2; Logic 3->Phys 3; + "3210": Logic 3->Phys 0; Logic 2->Phys 1; Logic 1->Phys 2; Logic 0->Phys 3; DSI PHY: Required properties:
@@ -131,6 +156,7 @@ Example: port { dsi0_out: endpoint { remote-endpoint = <&panel_in>; + lanes = <0 1 2 3>; }; }; };
drivers/gpu/drm/msm/dsi/dsi_host.c +96 -20
161 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 7/7] drm/msm/dsi: Parse DSI lanes via DT
Quoted 12 lines · Archit Taneja
The DSI driver is currently unaware of how the DSI physical data lanes are mapped to the logical lanes provided by the DSI controller.
Create a DT binding "qcom,data-lane-map" that provides this information on a given platform.
The MSM DSI controller is restricted in terms of what all mappings it can support. The lane polarity is fixed for all the lanes, the clock lanes are fixed, and the data lanes can be swapped among each other only for a few combinations. Apply these restrictions when we parse the DT data.
Quoted 7 lines
Signed-off-by Archit Taneja <[email protected]>--- .../devicetree/bindings/display/msm/dsi.txt | 32 +++++-
Quoted 2 lines
drivers/gpu/drm/msm/dsi/dsi_host.c | 116 +++++++++++++++++---- 2 files changed, 125 insertions(+), 23 deletions(-)