Skip to contentSkip to conversation

drm/msm: Don't track crtcs in msm private struct

PATCH New Sean Paul 2 participants 9 messages Dec 5, 2018 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

Sean Paul

author
#0 lore raw

PATCH 1/9 drm/msm: Don't track crtcs in msm private struct

From: Sean Paul <[email protected]>

drm core already tracks this, so we can just lean on that instead of tracking ourselves.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c  |  9 ++-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 10 +--
 drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c |  4 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 10 +--
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 12 +---
 drivers/gpu/drm/msm/msm_drv.c            | 79 +++++++++++++-----------
 drivers/gpu/drm/msm/msm_drv.h            |  3 -
 7 files changed, 62 insertions(+), 65 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +4 -5
index 1969f0d07d865..3796a2978a40b 100644
@@ -497,6 +497,7 @@ static void _dpu_kms_setup_displays(struct drm_device *dev,
 static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 {
 	struct msm_drm_private *priv;
+	struct drm_crtc *crtc;
 	int i;
 
 	if (!dpu_kms) {
@@ -511,9 +512,8 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 	}
 	priv = dpu_kms->dev->dev_private;
 
-	for (i = 0; i < priv->num_crtcs; i++)
-		priv->crtcs[i]->funcs->destroy(priv->crtcs[i]);
-	priv->num_crtcs = 0;
+	drm_for_each_crtc(crtc, dpu_kms->dev)
+		crtc->funcs->destroy(crtc);
 
 	for (i = 0; i < priv->num_planes; i++)
 		priv->planes[i]->funcs->destroy(priv->planes[i]);
@@ -598,12 +598,11 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 			ret = PTR_ERR(crtc);
 			goto fail;
 		}
-		priv->crtcs[priv->num_crtcs++] = crtc;
 	}
 
 	/* All CRTCs are compatible with all encoders */
 	for (i = 0; i < priv->num_encoders; i++)
-		priv->encoders[i]->possible_crtcs = (1 << priv->num_crtcs) - 1;
+		priv->encoders[i]->possible_crtcs = (1 << max_crtc_count) - 1;
 
 	return 0;
 fail:
drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c +5 -5
index b764d7f103127..7c597d21c97ba 100644
@@ -15,6 +15,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <drm/drm_crtc.h>
 #include <drm/drm_print.h>
 
 #include "msm_drv.h"
@@ -79,8 +80,7 @@ irqreturn_t mdp4_irq(struct msm_kms *kms)
 	struct mdp_kms *mdp_kms = to_mdp_kms(kms);
 	struct mdp4_kms *mdp4_kms = to_mdp4_kms(mdp_kms);
 	struct drm_device *dev = mdp4_kms->dev;
-	struct msm_drm_private *priv = dev->dev_private;
-	unsigned int id;
+	struct drm_crtc *crtc;
 	uint32_t status, enable;
 
 	enable = mdp4_read(mdp4_kms, REG_MDP4_INTR_ENABLE);
@@ -91,9 +91,9 @@ irqreturn_t mdp4_irq(struct msm_kms *kms)
 
 	mdp_dispatch_irqs(mdp_kms, status);
 
-	for (id = 0; id < priv->num_crtcs; id++)
-		if (status & mdp4_crtc_vblank(priv->crtcs[id]))
-			drm_handle_vblank(dev, id);
+	drm_for_each_crtc(crtc, dev)
+		if (status & mdp4_crtc_vblank(crtc))
+			drm_handle_vblank(dev, drm_crtc_index(crtc));
 
 	return IRQ_HANDLED;
 }
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +1 -3
index e437aa806f7be..f7f678c55e3ac 100644
@@ -373,7 +373,7 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)
 			goto fail;
 		}
 
-		crtc  = mdp4_crtc_init(dev, plane, priv->num_crtcs, i,
+		crtc  = mdp4_crtc_init(dev, plane, ARRAY_SIZE(mdp4_crtcs), i,
 				mdp4_crtcs[i]);
 		if (IS_ERR(crtc)) {
 			DRM_DEV_ERROR(dev->dev, "failed to construct crtc for %s\n",
@@ -381,8 +381,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)
 			ret = PTR_ERR(crtc);
 			goto fail;
 		}
-
-		priv->crtcs[priv->num_crtcs++] = crtc;
 	}
 
 	/*
drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c +5 -5
index 280e368bc9bb8..c66a7fbd9b9c3 100644
@@ -17,6 +17,7 @@
 
 #include <linux/irq.h>
 
+#include <drm/drm_crtc.h>
 #include <drm/drm_print.h>
 
 #include "msm_drv.h"
@@ -92,8 +93,7 @@ irqreturn_t mdp5_irq(struct msm_kms *kms)
 	struct mdp_kms *mdp_kms = to_mdp_kms(kms);
 	struct mdp5_kms *mdp5_kms = to_mdp5_kms(mdp_kms);
 	struct drm_device *dev = mdp5_kms->dev;
-	struct msm_drm_private *priv = dev->dev_private;
-	unsigned int id;
+	struct drm_crtc *crtc;
 	uint32_t status, enable;
 
 	enable = mdp5_read(mdp5_kms, REG_MDP5_INTR_EN);
@@ -104,9 +104,9 @@ irqreturn_t mdp5_irq(struct msm_kms *kms)
 
 	mdp_dispatch_irqs(mdp_kms, status);
 
-	for (id = 0; id < priv->num_crtcs; id++)
-		if (status & mdp5_crtc_vblank(priv->crtcs[id]))
-			drm_handle_vblank(dev, id);
+	drm_for_each_crtc(crtc, dev)
+		if (status & mdp5_crtc_vblank(crtc))
+			drm_handle_vblank(dev, drm_crtc_index(crtc));
 
 	return IRQ_HANDLED;
 }
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +3 -9
index d27e35a217bd7..4fb70532b0484 100644
@@ -520,7 +520,6 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 			DRM_DEV_ERROR(dev->dev, "failed to construct crtc %d (%d)\n", i, ret);
 			goto fail;
 		}
-		priv->crtcs[priv->num_crtcs++] = crtc;
 	}
 
 	/*
@@ -530,7 +529,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 	for (i = 0; i < priv->num_encoders; i++) {
 		struct drm_encoder *encoder = priv->encoders[i];
 
-		encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
+		encoder->possible_crtcs = (1 << num_crtcs) - 1;
 	}
 
 	return 0;
@@ -589,12 +588,11 @@ static bool mdp5_get_scanoutpos(struct drm_device *dev, unsigned int pipe,
 				ktime_t *stime, ktime_t *etime,
 				const struct drm_display_mode *mode)
 {
-	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_crtc *crtc;
 	struct drm_encoder *encoder;
 	int line, vsw, vbp, vactive_start, vactive_end, vfp_end;
 
-	crtc = priv->crtcs[pipe];
+	crtc = drm_crtc_from_index(dev, pipe);
 	if (!crtc) {
 		DRM_ERROR("Invalid crtc %d\n", pipe);
 		return false;
@@ -646,14 +644,10 @@ static bool mdp5_get_scanoutpos(struct drm_device *dev, unsigned int pipe,
 
 static u32 mdp5_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
 {
-	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_crtc *crtc;
 	struct drm_encoder *encoder;
 
-	if (pipe >= priv->num_crtcs)
-		return 0;
-
-	crtc = priv->crtcs[pipe];
+	crtc = drm_crtc_from_index(dev, pipe);
 	if (!crtc)
 		return 0;
 
drivers/gpu/drm/msm/msm_drv.c +44 -35

151 lines not on this page · raw message

drivers/gpu/drm/msm/msm_drv.h +0 -3
index 71a03ce21da53..fc677da06e33b 100644
@@ -194,9 +194,6 @@ struct msm_drm_private {
 	unsigned int num_planes;
 	struct drm_plane *planes[MAX_PLANES];
 
-	unsigned int num_crtcs;
-	struct drm_crtc *crtcs[MAX_CRTCS];
-
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 20181205162958.25025-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org

author
#2 lore raw

PATCH 2/9 drm/msm: Don't track encoders in msm private struct

From: Sean Paul <[email protected]>

drm core already tracks this, so we can just lean on that instead of tracking ourselves.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c  | 16 ++++++++--------
 drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c |  5 -----
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 12 ++++--------
 drivers/gpu/drm/msm/msm_drv.h            |  3 ---
 4 files changed, 12 insertions(+), 24 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +8 -8
index 3796a2978a40b..cbebc04e2d6ef 100644
@@ -457,8 +457,6 @@ static void _dpu_kms_initialize_dsi(struct drm_device *dev,
 		return;
 	}
 
-	priv->encoders[priv->num_encoders++] = encoder;
-
 	for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) {
 		if (!priv->dsi[i]) {
 			DPU_DEBUG("invalid msm_dsi for ctrl %d\n", i);
@@ -498,6 +496,7 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 {
 	struct msm_drm_private *priv;
 	struct drm_crtc *crtc;
+	struct drm_encoder *encoder;
 	int i;
 
 	if (!dpu_kms) {
@@ -523,9 +522,8 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 		priv->connectors[i]->funcs->destroy(priv->connectors[i]);
 	priv->num_connectors = 0;
 
-	for (i = 0; i < priv->num_encoders; i++)
-		priv->encoders[i]->funcs->destroy(priv->encoders[i]);
-	priv->num_encoders = 0;
+	drm_for_each_encoder(encoder, dpu_kms->dev)
+		encoder->funcs->destroy(encoder);
 }
 
 static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
@@ -534,6 +532,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 	struct drm_plane *primary_planes[MAX_PLANES], *plane;
 	struct drm_plane *cursor_planes[MAX_PLANES] = { NULL };
 	struct drm_crtc *crtc;
+	struct drm_encoder *encoder;
 
 	struct msm_drm_private *priv;
 	struct dpu_mdss_cfg *catalog;
@@ -556,7 +555,8 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 	 */
 	_dpu_kms_setup_displays(dev, priv, dpu_kms);
 
-	max_crtc_count = min(catalog->mixer_count, priv->num_encoders);
+	max_crtc_count = min(catalog->mixer_count,
+			     (u32)dev->mode_config.num_encoder);
 
 	/* Create the planes, keeping track of one primary/cursor per crtc */
 	for (i = 0; i < catalog->sspp_count; i++) {
@@ -601,8 +601,8 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 	}
 
 	/* All CRTCs are compatible with all encoders */
-	for (i = 0; i < priv->num_encoders; i++)
-		priv->encoders[i]->possible_crtcs = (1 << max_crtc_count) - 1;
+	drm_for_each_encoder(encoder, dpu_kms->dev)
+		encoder->possible_crtcs = (1 << max_crtc_count) - 1;
 
 	return 0;
 fail:
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -5
index f7f678c55e3ac..527a4ee06819f 100644
@@ -266,7 +266,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
 			return PTR_ERR(connector);
 		}
 
-		priv->encoders[priv->num_encoders++] = encoder;
 		priv->connectors[priv->num_connectors++] = connector;
 
 		break;
@@ -288,9 +287,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
 				return ret;
 			}
 		}
-
-		priv->encoders[priv->num_encoders++] = encoder;
-
 		break;
 	case DRM_MODE_ENCODER_DSI:
 		/* only DSI1 supported for now */
@@ -309,7 +305,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
 
 		/* TODO: Add DMA_S later? */
 		encoder->possible_crtcs = 1 << DMA_P;
-		priv->encoders[priv->num_encoders++] = encoder;
 
 		ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder);
 		if (ret) {
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +4 -8
index 4fb70532b0484..7cf54737944e4 100644
@@ -332,7 +332,6 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,
 					     struct mdp5_ctl *ctl)
 {
 	struct drm_device *dev = mdp5_kms->dev;
-	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_encoder *encoder;
 
 	encoder = mdp5_encoder_init(dev, intf, ctl);
@@ -341,8 +340,6 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,
 		return encoder;
 	}
 
-	priv->encoders[priv->num_encoders++] = encoder;
-
 	return encoder;
 }
 
@@ -455,6 +452,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 {
 	struct drm_device *dev = mdp5_kms->dev;
 	struct msm_drm_private *priv = dev->dev_private;
+	struct drm_encoder *encoder;
 	const struct mdp5_cfg_hw *hw_cfg;
 	unsigned int num_crtcs;
 	int i, ret, pi = 0, ci = 0;
@@ -478,7 +476,8 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 	 * the MDP5 interfaces) than the number of layer mixers present in HW,
 	 * but let's be safe here anyway
 	 */
-	num_crtcs = min(priv->num_encoders, mdp5_kms->num_hwmixers);
+	num_crtcs = min((unsigned)dev->mode_config.num_encoder,
+			mdp5_kms->num_hwmixers);
 
 	/*
 	 * Construct planes equaling the number of hw pipes, and CRTCs for the
@@ -526,11 +525,8 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 	 * Now that we know the number of crtcs we've created, set the possible
 	 * crtcs for the encoders
 	 */
-	for (i = 0; i < priv->num_encoders; i++) {
-		struct drm_encoder *encoder = priv->encoders[i];
-
+	drm_for_each_encoder(encoder, dev)
 		encoder->possible_crtcs = (1 << num_crtcs) - 1;
-	}
 
 	return 0;
 
drivers/gpu/drm/msm/msm_drv.h +0 -3
index fc677da06e33b..c6eff08e80170 100644
@@ -197,9 +197,6 @@ struct msm_drm_private {
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
-	unsigned int num_encoders;
-	struct drm_encoder *encoders[MAX_ENCODERS];
-
 	unsigned int num_bridges;
 	struct drm_bridge *bridges[MAX_BRIDGES];
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
author
#3 lore raw

PATCH 4/9 drm/msm: Don't track planes in msm private struct

In reply to a message not in the archive

From: Sean Paul <[email protected]>

drm core already tracks this, so we can just lean on that instead of tracking ourselves.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c  | 7 +++----
 drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 --
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 --
 drivers/gpu/drm/msm/msm_drv.h            | 3 ---
 4 files changed, 3 insertions(+), 11 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -4
index cbebc04e2d6ef..8dede6cb9b7d7 100644
@@ -496,6 +496,7 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 {
 	struct msm_drm_private *priv;
 	struct drm_crtc *crtc;
+	struct drm_plane *plane;
 	struct drm_encoder *encoder;
 	int i;
 
@@ -514,9 +515,8 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 	drm_for_each_crtc(crtc, dpu_kms->dev)
 		crtc->funcs->destroy(crtc);
 
-	for (i = 0; i < priv->num_planes; i++)
-		priv->planes[i]->funcs->destroy(priv->planes[i]);
-	priv->num_planes = 0;
+	drm_for_each_plane(plane, dpu_kms->dev)
+		plane->funcs->destroy(plane);
 
 	for (i = 0; i < priv->num_connectors; i++)
 		priv->connectors[i]->funcs->destroy(priv->connectors[i]);
@@ -581,7 +581,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 			ret = PTR_ERR(plane);
 			goto fail;
 		}
-		priv->planes[priv->num_planes++] = plane;
 
 		if (type == DRM_PLANE_TYPE_CURSOR)
 			cursor_planes[cursor_planes_idx++] = plane;
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -2
index 527a4ee06819f..40e2b462a03e1 100644
@@ -325,7 +325,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
 static int modeset_init(struct mdp4_kms *mdp4_kms)
 {
 	struct drm_device *dev = mdp4_kms->dev;
-	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_plane *plane;
 	struct drm_crtc *crtc;
 	int i, ret;
@@ -356,7 +355,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)
 			ret = PTR_ERR(plane);
 			goto fail;
 		}
-		priv->planes[priv->num_planes++] = plane;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(mdp4_crtcs); i++) {
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +0 -2
index 7cf54737944e4..0a1fa40d375ce 100644
@@ -451,7 +451,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,
 static int modeset_init(struct mdp5_kms *mdp5_kms)
 {
 	struct drm_device *dev = mdp5_kms->dev;
-	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_encoder *encoder;
 	const struct mdp5_cfg_hw *hw_cfg;
 	unsigned int num_crtcs;
@@ -502,7 +501,6 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
 			DRM_DEV_ERROR(dev->dev, "failed to construct plane %d (%d)\n", i, ret);
 			goto fail;
 		}
-		priv->planes[priv->num_planes++] = plane;
 
 		if (type == DRM_PLANE_TYPE_PRIMARY)
 			primary[pi++] = plane;
drivers/gpu/drm/msm/msm_drv.h +0 -3
index 1902713ed84b0..6cd61199d20a0 100644
@@ -191,9 +191,6 @@ struct msm_drm_private {
 
 	struct workqueue_struct *wq;
 
-	unsigned int num_planes;
-	struct drm_plane *planes[MAX_PLANES];
-
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
author
#4 lore raw

PATCH 5/9 drm/msm: Don't track connectors in msm private struct

In reply to a message not in the archive

From: Sean Paul <[email protected]>

drm core already tracks this, so we can just lean on that instead of tracking ourselves.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c  | 10 ++++++----
 drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c |  3 ---
 drivers/gpu/drm/msm/dsi/dsi.c            |  2 --
 drivers/gpu/drm/msm/edp/edp.c            |  3 ---
 drivers/gpu/drm/msm/hdmi/hdmi.c          |  3 ---
 drivers/gpu/drm/msm/msm_drv.h            |  3 ---
 drivers/gpu/drm/msm/msm_fbdev.c          |  2 +-
 7 files changed, 7 insertions(+), 19 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +6 -4
index 8dede6cb9b7d7..4f2fcdfe2644e 100644
@@ -498,7 +498,8 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 	struct drm_crtc *crtc;
 	struct drm_plane *plane;
 	struct drm_encoder *encoder;
-	int i;
+	struct drm_connector_list_iter conn_iter;
+	struct drm_connector *connector;
 
 	if (!dpu_kms) {
 		DPU_ERROR("invalid dpu_kms\n");
@@ -518,9 +519,10 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
 	drm_for_each_plane(plane, dpu_kms->dev)
 		plane->funcs->destroy(plane);
 
-	for (i = 0; i < priv->num_connectors; i++)
-		priv->connectors[i]->funcs->destroy(priv->connectors[i]);
-	priv->num_connectors = 0;
+	drm_connector_list_iter_begin(dpu_kms->dev, &conn_iter);
+	drm_for_each_connector_iter(connector, &conn_iter)
+		connector->funcs->destroy(connector);
+	drm_connector_list_iter_end(&conn_iter);
 
 	drm_for_each_encoder(encoder, dpu_kms->dev)
 		encoder->funcs->destroy(encoder);
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +0 -3
index 40e2b462a03e1..e86134fed2244 100644
@@ -265,9 +265,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
 			DRM_DEV_ERROR(dev->dev, "failed to initialize LVDS connector\n");
 			return PTR_ERR(connector);
 		}
-
-		priv->connectors[priv->num_connectors++] = connector;
-
 		break;
 	case DRM_MODE_ENCODER_TMDS:
 		encoder = mdp4_dtv_encoder_init(dev);
drivers/gpu/drm/msm/dsi/dsi.c +0 -2
index 97b906a9b3945..e1d990f316732 100644
@@ -250,8 +250,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
 		goto fail;
 	}
 
-	priv->connectors[priv->num_connectors++] = msm_dsi->connector;
-
 	return 0;
 fail:
 	/* bridge/connector are normally destroyed by drm: */
drivers/gpu/drm/msm/edp/edp.c +0 -3
index 694c2d43011f6..10adf89d5d469 100644
@@ -148,7 +148,6 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev,
 				struct drm_encoder *encoder)
 {
 	struct platform_device *pdev = edp->pdev;
-	struct msm_drm_private *priv = dev->dev_private;
 	int ret;
 
 	edp->encoder = encoder;
@@ -188,8 +187,6 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev,
 
 	encoder->bridge = edp->bridge;
 
-	priv->connectors[priv->num_connectors++] = edp->connector;
-
 	return 0;
 
 fail:
drivers/gpu/drm/msm/hdmi/hdmi.c +0 -3
index 1901ae820ef0b..ce564331e6080 100644
@@ -291,7 +291,6 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev)
 int msm_hdmi_modeset_init(struct hdmi *hdmi,
 		struct drm_device *dev, struct drm_encoder *encoder)
 {
-	struct msm_drm_private *priv = dev->dev_private;
 	struct platform_device *pdev = hdmi->pdev;
 	int ret;
 
@@ -340,8 +339,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
 
 	encoder->bridge = hdmi->bridge;
 
-	priv->connectors[priv->num_connectors++] = hdmi->connector;
-
 	platform_set_drvdata(pdev, hdmi);
 
 	return 0;
drivers/gpu/drm/msm/msm_drv.h +0 -3
index 6cd61199d20a0..6c013addce68c 100644
@@ -194,9 +194,6 @@ struct msm_drm_private {
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
-	unsigned int num_connectors;
-	struct drm_connector *connectors[MAX_CONNECTORS];
-
 	/* Properties */
 	struct drm_property *plane_property[PLANE_PROP_MAX_NUM];
 
drivers/gpu/drm/msm/msm_fbdev.c +1 -1
index c03e860ba737f..a62ef39d65f25 100644
@@ -174,7 +174,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
 
 	drm_fb_helper_prepare(dev, helper, &msm_fb_helper_funcs);
 
-	ret = drm_fb_helper_init(dev, helper, priv->num_connectors);
+	ret = drm_fb_helper_init(dev, helper, dev->mode_config.num_connector);
 	if (ret) {
 		DRM_DEV_ERROR(dev->dev, "could not init fbdev: ret=%d\n", ret);
 		goto fail;
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
author
#5 lore raw

PATCH 6/9 drm/msm: mdp5: Remove premultiplied from plane state

In reply to a message not in the archive

From: Sean Paul <[email protected]>

It's always 0, and not exposed via property, so remove it and all affected code.

---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c  | 13 +------------
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h   |  1 -
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c |  2 --
 drivers/gpu/drm/msm/msm_drv.h              |  1 -
 4 files changed, 1 insertion(+), 16 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +1 -12
index c5fde1a4191aa..035be33405f08 100644
@@ -310,18 +310,7 @@ static void blend_setup(struct drm_crtc *crtc)
 
 		DBG("Stage %d fg_alpha %x bg_alpha %x", i, fg_alpha, bg_alpha);
 
-		if (format->alpha_enable && pstates[i]->premultiplied) {
-			blend_op = MDP5_LM_BLEND_OP_MODE_FG_ALPHA(FG_CONST) |
-				MDP5_LM_BLEND_OP_MODE_BG_ALPHA(FG_PIXEL);
-			if (fg_alpha != 0xff) {
-				bg_alpha = fg_alpha;
-				blend_op |=
-					MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA |
-					MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA;
-			} else {
-				blend_op |= MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA;
-			}
-		} else if (format->alpha_enable) {
+		if (format->alpha_enable) {
 			blend_op = MDP5_LM_BLEND_OP_MODE_FG_ALPHA(FG_PIXEL) |
 				MDP5_LM_BLEND_OP_MODE_BG_ALPHA(FG_PIXEL);
 			if (fg_alpha != 0xff) {
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +0 -1
index 854dfd30e8292..61b3331dcab9c 100644
@@ -108,7 +108,6 @@ struct mdp5_plane_state {
 	struct mdp5_hw_pipe *r_hwpipe;	/* right hwpipe */
 
 	/* aligned with property */
-	uint8_t premultiplied;
 	uint8_t zpos;
 	uint8_t alpha;
 
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +0 -2
index 1a36d6f612826..e96aff8e55757 100644
@@ -174,7 +174,6 @@ mdp5_plane_atomic_print_state(struct drm_printer *p,
 		drm_printf(p, "\tright-hwpipe=%s\n",
 			   pstate->r_hwpipe ? pstate->r_hwpipe->name :
 					      "(null)");
-	drm_printf(p, "\tpremultiplied=%u\n", pstate->premultiplied);
 	drm_printf(p, "\tzpos=%u\n", pstate->zpos);
 	drm_printf(p, "\talpha=%u\n", pstate->alpha);
 	drm_printf(p, "\tstage=%s\n", stage2name(pstate->stage));
@@ -192,7 +191,6 @@ static void mdp5_plane_reset(struct drm_plane *plane)
 
 	/* assign default blend parameters */
 	mdp5_state->alpha = 255;
-	mdp5_state->premultiplied = 0;
 
 	if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 		mdp5_state->zpos = STAGE_BASE;
drivers/gpu/drm/msm/msm_drv.h +0 -1
index 6c013addce68c..b6aa04511ded9 100644
@@ -73,7 +73,6 @@ struct msm_file_private {
 enum msm_mdp_plane_property {
 	PLANE_PROP_ZPOS,
 	PLANE_PROP_ALPHA,
-	PLANE_PROP_PREMULTIPLIED,
 	PLANE_PROP_MAX_NUM
 };
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
author
#6 lore raw

PATCH 7/9 drm/msm: mdp5: Remove alpha from plane state

In reply to a message not in the archive

From: Sean Paul <[email protected]>

It's always 0xFF, so remove it and any code that relies on it being != 0xFF.

---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c  | 27 ++++++----------------
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h   |  1 -
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c |  4 ----
 drivers/gpu/drm/msm/msm_drv.h              |  1 -
 4 files changed, 7 insertions(+), 26 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +7 -20
index 035be33405f08..bfa97ec063965 100644
@@ -230,7 +230,7 @@ static void blend_setup(struct drm_crtc *crtc)
 	struct mdp5_hw_mixer *r_mixer = pipeline->r_mixer;
 	uint32_t r_lm = r_mixer ? r_mixer->lm : 0;
 	struct mdp5_ctl *ctl = mdp5_cstate->ctl;
-	uint32_t blend_op, fg_alpha, bg_alpha, ctl_blend_flags = 0;
+	uint32_t blend_op, ctl_blend_flags = 0;
 	unsigned long flags;
 	enum mdp5_pipe stage[STAGE_MAX + 1][MAX_PIPE_STAGE] = { { SSPP_NONE } };
 	enum mdp5_pipe r_stage[STAGE_MAX + 1][MAX_PIPE_STAGE] = { { SSPP_NONE } };
@@ -300,44 +300,31 @@ static void blend_setup(struct drm_crtc *crtc)
 		plane = pstates[i]->base.plane;
 		blend_op = MDP5_LM_BLEND_OP_MODE_FG_ALPHA(FG_CONST) |
 			MDP5_LM_BLEND_OP_MODE_BG_ALPHA(BG_CONST);
-		fg_alpha = pstates[i]->alpha;
-		bg_alpha = 0xFF - pstates[i]->alpha;
 
 		if (!format->alpha_enable && bg_alpha_enabled)
 			mixer_op_mode = 0;
 		else
 			mixer_op_mode |= mdp5_lm_use_fg_alpha_mask(i);
 
-		DBG("Stage %d fg_alpha %x bg_alpha %x", i, fg_alpha, bg_alpha);
-
 		if (format->alpha_enable) {
 			blend_op = MDP5_LM_BLEND_OP_MODE_FG_ALPHA(FG_PIXEL) |
-				MDP5_LM_BLEND_OP_MODE_BG_ALPHA(FG_PIXEL);
-			if (fg_alpha != 0xff) {
-				bg_alpha = fg_alpha;
-				blend_op |=
-				       MDP5_LM_BLEND_OP_MODE_FG_MOD_ALPHA |
-				       MDP5_LM_BLEND_OP_MODE_FG_INV_MOD_ALPHA |
-				       MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA |
-				       MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA;
-			} else {
-				blend_op |= MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA;
-			}
+				MDP5_LM_BLEND_OP_MODE_BG_ALPHA(FG_PIXEL) |
+				MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA;
 		}
 
 		mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_OP_MODE(lm,
 				blender(i)), blend_op);
 		mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_FG_ALPHA(lm,
-				blender(i)), fg_alpha);
+				blender(i)), 0xFF);
 		mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_BG_ALPHA(lm,
-				blender(i)), bg_alpha);
+				blender(i)), 0);
 		if (r_mixer) {
 			mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_OP_MODE(r_lm,
 					blender(i)), blend_op);
 			mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_FG_ALPHA(r_lm,
-					blender(i)), fg_alpha);
+					blender(i)), 0xFF);
 			mdp5_write(mdp5_kms, REG_MDP5_LM_BLEND_BG_ALPHA(r_lm,
-					blender(i)), bg_alpha);
+					blender(i)), 0);
 		}
 	}
 
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +0 -1
index 61b3331dcab9c..8605a7dee44c1 100644
@@ -109,7 +109,6 @@ struct mdp5_plane_state {
 
 	/* aligned with property */
 	uint8_t zpos;
-	uint8_t alpha;
 
 	/* assigned by crtc blender */
 	enum mdp_mixer_stage_id stage;
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +0 -4
index e96aff8e55757..5ea06804cef2b 100644
@@ -175,7 +175,6 @@ mdp5_plane_atomic_print_state(struct drm_printer *p,
 			   pstate->r_hwpipe ? pstate->r_hwpipe->name :
 					      "(null)");
 	drm_printf(p, "\tzpos=%u\n", pstate->zpos);
-	drm_printf(p, "\talpha=%u\n", pstate->alpha);
 	drm_printf(p, "\tstage=%s\n", stage2name(pstate->stage));
 }
 
@@ -189,9 +188,6 @@ static void mdp5_plane_reset(struct drm_plane *plane)
 	kfree(to_mdp5_plane_state(plane->state));
 	mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
 
-	/* assign default blend parameters */
-	mdp5_state->alpha = 255;
-
 	if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 		mdp5_state->zpos = STAGE_BASE;
 	else
drivers/gpu/drm/msm/msm_drv.h +0 -1
index b6aa04511ded9..a578bad540130 100644
@@ -72,7 +72,6 @@ struct msm_file_private {
 
 enum msm_mdp_plane_property {
 	PLANE_PROP_ZPOS,
-	PLANE_PROP_ALPHA,
 	PLANE_PROP_MAX_NUM
 };
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
author
#7 lore raw

PATCH 8/9 drm/msm: mdp5: Remove mdp5_plane_install_rotation_property()

In reply to a message not in the archive

From: Sean Paul <[email protected]>

Just call drm_plane_create_rotation_property() directly

---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +6 -12
index 5ea06804cef2b..41590588a6f39 100644
@@ -52,17 +52,6 @@ static void mdp5_plane_destroy(struct drm_plane *plane)
 	kfree(mdp5_plane);
 }
 
-static void mdp5_plane_install_rotation_property(struct drm_device *dev,
-		struct drm_plane *plane)
-{
-	drm_plane_create_rotation_property(plane,
-					   DRM_MODE_ROTATE_0,
-					   DRM_MODE_ROTATE_0 |
-					   DRM_MODE_ROTATE_180 |
-					   DRM_MODE_REFLECT_X |
-					   DRM_MODE_REFLECT_Y);
-}
-
 /* helper to install properties which are common to planes and crtcs */
 static void mdp5_plane_install_properties(struct drm_plane *plane,
 		struct drm_mode_object *obj)
@@ -98,7 +87,12 @@ static void mdp5_plane_install_properties(struct drm_plane *plane,
 
 	INSTALL_RANGE_PROPERTY(zpos, ZPOS, 1, 255, 1);
 
-	mdp5_plane_install_rotation_property(dev, plane);
+	drm_plane_create_rotation_property(plane,
+					   DRM_MODE_ROTATE_0,
+					   DRM_MODE_ROTATE_0 |
+					   DRM_MODE_ROTATE_180 |
+					   DRM_MODE_REFLECT_X |
+					   DRM_MODE_REFLECT_Y);
 
 #undef INSTALL_RANGE_PROPERTY
 #undef INSTALL_ENUM_PROPERTY
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
reviewer
#8 lore raw

PATCH 3/9 drm/msm: Don't track bridges in msm private struct

In reply to Sean Paul

From: Sean Paul <[email protected]>

drm core already tracks this, so we can just lean on that instead of tracking ourselves.

---
 drivers/gpu/drm/msm/dsi/dsi.c   | 1 -
 drivers/gpu/drm/msm/edp/edp.c   | 1 -
 drivers/gpu/drm/msm/hdmi/hdmi.c | 1 -
 drivers/gpu/drm/msm/msm_drv.h   | 3 ---
 4 files changed, 6 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.c +0 -1
index 7b2a1e6a88107..97b906a9b3945 100644
@@ -250,7 +250,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
 		goto fail;
 	}
 
-	priv->bridges[priv->num_bridges++]       = msm_dsi->bridge;
 	priv->connectors[priv->num_connectors++] = msm_dsi->connector;
 
 	return 0;
drivers/gpu/drm/msm/edp/edp.c +0 -1
index 6a63aba98a307..694c2d43011f6 100644
@@ -188,7 +188,6 @@ int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev,
 
 	encoder->bridge = edp->bridge;
 
-	priv->bridges[priv->num_bridges++]       = edp->bridge;
 	priv->connectors[priv->num_connectors++] = edp->connector;
 
 	return 0;
drivers/gpu/drm/msm/hdmi/hdmi.c +0 -1
index ace8aab072761..1901ae820ef0b 100644
@@ -340,7 +340,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
 
 	encoder->bridge = hdmi->bridge;
 
-	priv->bridges[priv->num_bridges++]       = hdmi->bridge;
 	priv->connectors[priv->num_connectors++] = hdmi->connector;
 
 	platform_set_drvdata(pdev, hdmi);
drivers/gpu/drm/msm/msm_drv.h +0 -3
index c6eff08e80170..1902713ed84b0 100644
@@ -197,9 +197,6 @@ struct msm_drm_private {
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
-	unsigned int num_bridges;
-	struct drm_bridge *bridges[MAX_BRIDGES];
-
 	unsigned int num_connectors;
 	struct drm_connector *connectors[MAX_CONNECTORS];
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
reviewer
#9 lore raw

PATCH 9/9 drm/msm: mdp5: Remove custom property code in plane

In reply to Sean Paul

From: Sean Paul <[email protected]>

mdp5 only exposes one custom property, and it's zpos. Fortunately, we have a standard zpos property now, we can remove the hand-rolled property code entirely from mdp5 and rely on core.

---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c  |   2 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h   |   3 -
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 101 +--------------------
 drivers/gpu/drm/msm/msm_drv.h              |   8 --
 4 files changed, 3 insertions(+), 111 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +1 -1
index bfa97ec063965..4ccef117ced90 100644
@@ -551,7 +551,7 @@ static int pstate_cmp(const void *a, const void *b)
 {
 	struct plane_state *pa = (struct plane_state *)a;
 	struct plane_state *pb = (struct plane_state *)b;
-	return pa->state->zpos - pb->state->zpos;
+	return pa->state->base.normalized_zpos - pb->state->base.normalized_zpos;
 }
 
 /* is there a helper for this? */
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +0 -3
index 8605a7dee44c1..44d03fc31e323 100644
@@ -107,9 +107,6 @@ struct mdp5_plane_state {
 	struct mdp5_hw_pipe *hwpipe;
 	struct mdp5_hw_pipe *r_hwpipe;	/* right hwpipe */
 
-	/* aligned with property */
-	uint8_t zpos;
-
 	/* assigned by crtc blender */
 	enum mdp_mixer_stage_id stage;
 };
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +2 -99

131 lines not on this page · raw message

drivers/gpu/drm/msm/msm_drv.h +0 -8
index a578bad540130..60a7da09cf3b3 100644
@@ -70,11 +70,6 @@ struct msm_file_private {
 	int queueid;
 };
 
-enum msm_mdp_plane_property {
-	PLANE_PROP_ZPOS,
-	PLANE_PROP_MAX_NUM
-};
-
 struct msm_vblank_ctrl {
 	struct kthread_work work;
 	struct list_head event_list;
@@ -192,9 +187,6 @@ struct msm_drm_private {
 	struct msm_drm_thread disp_thread[MAX_CRTCS];
 	struct msm_drm_thread event_thread[MAX_CRTCS];
 
-	/* Properties */
-	struct drm_property *plane_property[PLANE_PROP_MAX_NUM];
-
 	/* VRAM carveout, used when no IOMMU: */
 	struct {
 		unsigned long size;
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

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