Patchwork [3/9] drm/msm: Don't track bridges in msm private struct

login
register
mail settings
Submitter Sean Paul
Date Dec. 5, 2018, 4:29 p.m.
Message ID <20181205162958.25025-3-sean@poorly.run>
Download mbox | patch
Permalink /patch/673321/
State New
Headers show

Comments

Sean Paul - Dec. 5, 2018, 4:29 p.m.
From: Sean Paul <seanpaul@chromium.org>

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

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 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(-)

Patch

diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index 7b2a1e6a88107..97b906a9b3945 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -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;
diff --git a/drivers/gpu/drm/msm/edp/edp.c b/drivers/gpu/drm/msm/edp/edp.c
index 6a63aba98a307..694c2d43011f6 100644
--- a/drivers/gpu/drm/msm/edp/edp.c
+++ b/drivers/gpu/drm/msm/edp/edp.c
@@ -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;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index ace8aab072761..1901ae820ef0b 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -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);
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index c6eff08e80170..1902713ed84b0 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -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];