Skip to contentSkip to conversation

drm/msm/mdp5:Add DMA pipe planes for MDP5

PATCH In review Jilai Wang 2 participants 3 messages Jul 7, 2015 – Jul 9, 2015

Subsystems (3)
lore
Share & tools
lore

Jilai Wang

author
#0 lore raw

PATCH 1/1 drm/msm/mdp5:Add DMA pipe planes for MDP5

This change is to add planes which use DMA pipes for MDP5.

---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +20 -3
index cbda41d..f40896d 100644
@@ -316,9 +316,12 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 	static const enum mdp5_pipe crtcs[] = {
 			SSPP_RGB0, SSPP_RGB1, SSPP_RGB2, SSPP_RGB3,
 	};
-	static const enum mdp5_pipe pub_planes[] = {
+	static const enum mdp5_pipe vig_planes[] = {
 			SSPP_VIG0, SSPP_VIG1, SSPP_VIG2, SSPP_VIG3,
 	};
+	static const enum mdp5_pipe dma_planes[] = {
+			SSPP_DMA0, SSPP_DMA1,
+	};
 	struct drm_device *dev = mdp5_kms->dev;
 	struct msm_drm_private *priv = dev->dev_private;
 	const struct mdp5_cfg_hw *hw_cfg;
@@ -361,12 +364,26 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 	for (i = 0; i < hw_cfg->pipe_vig.count; i++) {
 		struct drm_plane *plane;
 
-		plane = mdp5_plane_init(dev, pub_planes[i], false,
+		plane = mdp5_plane_init(dev, vig_planes[i], false,
 			hw_cfg->pipe_vig.base[i], hw_cfg->pipe_vig.caps);
 		if (IS_ERR(plane)) {
 			ret = PTR_ERR(plane);
 			dev_err(dev->dev, "failed to construct %s plane: %d\n",
-					pipe2name(pub_planes[i]), ret);
+					pipe2name(vig_planes[i]), ret);
+			goto fail;
+		}
+	}
+
+	/* DMA planes */
+	for (i = 0; i < hw_cfg->pipe_dma.count; i++) {
+		struct drm_plane *plane;
+
+		plane = mdp5_plane_init(dev, dma_planes[i], false,
+			hw_cfg->pipe_dma.base[i], hw_cfg->pipe_dma.caps);
+		if (IS_ERR(plane)) {
+			ret = PTR_ERR(plane);
+			dev_err(dev->dev, "failed to construct %s plane: %d\n",
+					pipe2name(dma_planes[i]), ret);
 			goto fail;
 		}
 	}
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 1 line · Jilai Wang

This change is to add planes which use DMA pipes for MDP5.

are DMA pipes only supporting memory->memory operation, or am I reading too much into the name "DMA"? I'm wondering if we need to fix the possible_crtcs param that mdp5_plane_init passes to drm_universal_plane_init()?

BR,
-R

Quoted 56 lines
---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +20 -4
index cbda41d..f40896d 100644
@@ -316,9 +316,12 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
        static const enum mdp5_pipe crtcs[] = {
                        SSPP_RGB0, SSPP_RGB1, SSPP_RGB2, SSPP_RGB3,
        };
-       static const enum mdp5_pipe pub_planes[] = {
+       static const enum mdp5_pipe vig_planes[] = {
                        SSPP_VIG0, SSPP_VIG1, SSPP_VIG2, SSPP_VIG3,
        };
+       static const enum mdp5_pipe dma_planes[] = {
+                       SSPP_DMA0, SSPP_DMA1,
+       };
        struct drm_device *dev = mdp5_kms->dev;
        struct msm_drm_private *priv = dev->dev_private;
        const struct mdp5_cfg_hw *hw_cfg;
@@ -361,12 +364,26 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
        for (i = 0; i < hw_cfg->pipe_vig.count; i++) {
                struct drm_plane *plane;
 
-               plane = mdp5_plane_init(dev, pub_planes[i], false,
+               plane = mdp5_plane_init(dev, vig_planes[i], false,
                        hw_cfg->pipe_vig.base[i], hw_cfg->pipe_vig.caps);
                if (IS_ERR(plane)) {
                        ret = PTR_ERR(plane);
                        dev_err(dev->dev, "failed to construct %s plane: %d\n",
-                                       pipe2name(pub_planes[i]), ret);
+                                       pipe2name(vig_planes[i]), ret);
+                       goto fail;
+               }
+       }
+
+       /* DMA planes */
+       for (i = 0; i < hw_cfg->pipe_dma.count; i++) {
+               struct drm_plane *plane;
+
+               plane = mdp5_plane_init(dev, dma_planes[i], false,
+                       hw_cfg->pipe_dma.base[i], hw_cfg->pipe_dma.caps);
+               if (IS_ERR(plane)) {
+                       ret = PTR_ERR(plane);
+                       dev_err(dev->dev, "failed to construct %s plane: %d\n",
+                                       pipe2name(dma_planes[i]), ret);
                        goto fail;
                }
        }
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

#2 lore raw

Hi Rob,

DMA pipes can be configured to work in either line mode or block mode. In line mode, it is the same as RGB/VIG pipes except no CSC/SCALE/PP/... support. So it can be used by any CRTC.
In block mode, it is used as a rotator with writeback(0/1) interface which is not covered by this change.

Quoted 66 lines · Jilai Wang
Quoted 1 line

This change is to add planes which use DMA pipes for MDP5.

are DMA pipes only supporting memory->memory operation, or am I reading too much into the name "DMA"? I'm wondering if we need to fix the possible_crtcs param that mdp5_plane_init passes to drm_universal_plane_init()?

BR,
-R

Quoted 54 lines
---
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +19 -3
index cbda41d..f40896d 100644
@@ -316,9 +316,12 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
        static const enum mdp5_pipe crtcs[] = {
                        SSPP_RGB0, SSPP_RGB1, SSPP_RGB2, SSPP_RGB3,
        };
-       static const enum mdp5_pipe pub_planes[] = {
+       static const enum mdp5_pipe vig_planes[] = {
                        SSPP_VIG0, SSPP_VIG1, SSPP_VIG2, SSPP_VIG3,
        };
+       static const enum mdp5_pipe dma_planes[] = {
+                       SSPP_DMA0, SSPP_DMA1,
+       };
        struct drm_device *dev = mdp5_kms->dev;
        struct msm_drm_private *priv = dev->dev_private;
        const struct mdp5_cfg_hw *hw_cfg;
@@ -361,12 +364,26 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
        for (i = 0; i < hw_cfg->pipe_vig.count; i++) {
                struct drm_plane *plane;
 
-               plane = mdp5_plane_init(dev, pub_planes[i], false,
+               plane = mdp5_plane_init(dev, vig_planes[i], false,
                        hw_cfg->pipe_vig.base[i],
 hw_cfg->pipe_vig.caps);
                if (IS_ERR(plane)) {
                        ret = PTR_ERR(plane);
                        dev_err(dev->dev, "failed to construct %s plane:
 %d\n",
-                                       pipe2name(pub_planes[i]), ret);
+                                       pipe2name(vig_planes[i]), ret);
+                       goto fail;
+               }
+       }
+
+       /* DMA planes */
+       for (i = 0; i < hw_cfg->pipe_dma.count; i++) {
+               struct drm_plane *plane;
+
+               plane = mdp5_plane_init(dev, dma_planes[i], false,
+                       hw_cfg->pipe_dma.base[i],
 hw_cfg->pipe_dma.caps);
+               if (IS_ERR(plane)) {
+                       ret = PTR_ERR(plane);
+                       dev_err(dev->dev, "failed to construct %s plane:

%d\n",
+ pipe2name(dma_planes[i]), ret);

Quoted 9 lines
Quoted 8 lines
                        goto fail;
                }
        }

--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel