drm/msm/dp: Remove unused defines and members

Throughout the Qualcomm Displayport driver a number of defines and
struct members has become unused, but lingers in the code. Remove these.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/585345/
Link: https://lore.kernel.org/r/20240328-msm-dp-cleanup-v2-3-a5aed9798d32@quicinc.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/dp/dp_audio.c b/drivers/gpu/drm/msm/dp/dp_audio.c
index 7634e4b742084171218ac06d20a2c3929211ff5b..7fd0c1793ba357926557ee827839720aaa9a64fe 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_audio.c
+++ b/drivers/gpu/drm/msm/dp/dp_audio.c
@@ -22,9 +22,7 @@ struct dp_audio_private {
        struct platform_device *pdev;
        struct drm_device *drm_dev;
        struct dp_catalog *catalog;
-       struct dp_panel *panel;
 
-       bool engine_on;
        u32 channels;
 
        struct dp_audio dp_audio;
@@ -356,8 +354,6 @@ static void dp_audio_enable(struct dp_audio_private *audio, bool enable)
 
        catalog->audio_data = enable;
        dp_catalog_audio_enable(catalog);
-
-       audio->engine_on = enable;
 }
 
 static struct dp_audio_private *dp_audio_get_data(struct platform_device *pdev)
@@ -571,7 +567,6 @@ struct dp_audio *dp_audio_get(struct platform_device *pdev,
        }
 
        audio->pdev = pdev;
-       audio->panel = panel;
        audio->catalog = catalog;
 
        dp_audio = &audio->dp_audio;

diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c
index 034fbc9bc11e098971a912361f62537a03ea4646..59549ae80d8132a052715f52ec0a10537c82dc91 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_catalog.c
+++ b/drivers/gpu/drm/msm/dp/dp_catalog.c
@@ -81,7 +81,6 @@ struct dp_catalog_private {
        struct dss_io_data io;
        u32 (*audio_map)[DP_AUDIO_SDP_HEADER_MAX];
        struct dp_catalog dp_catalog;
-       u8 aux_lut_cfg_index[PHY_AUX_CFG_MAX];
 };
 
 void dp_catalog_snapshot(struct dp_catalog *dp_catalog, struct msm_disp_state *disp_state)

diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.h b/drivers/gpu/drm/msm/dp/dp_catalog.h
index 54b878c93f6d5c2674eee64843fee0839637a735..10c0d8b26100ac16837b960c2c8c53504c831471 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_catalog.h
+++ b/drivers/gpu/drm/msm/dp/dp_catalog.h
@@ -28,26 +28,9 @@
 #define DP_INTR_FRAME_END              BIT(6)
 #define DP_INTR_CRC_UPDATED            BIT(9)
 
-#define DP_AUX_CFG_MAX_VALUE_CNT 3
-
 #define DP_HW_VERSION_1_0      0x10000000
 #define DP_HW_VERSION_1_2      0x10020000
 
-/* PHY AUX config registers */
-enum dp_phy_aux_config_type {
-       PHY_AUX_CFG0,
-       PHY_AUX_CFG1,
-       PHY_AUX_CFG2,
-       PHY_AUX_CFG3,
-       PHY_AUX_CFG4,
-       PHY_AUX_CFG5,
-       PHY_AUX_CFG6,
-       PHY_AUX_CFG7,
-       PHY_AUX_CFG8,
-       PHY_AUX_CFG9,
-       PHY_AUX_CFG_MAX,
-};
-
 enum dp_catalog_audio_sdp_type {
        DP_AUDIO_SDP_STREAM,
        DP_AUDIO_SDP_TIMESTAMP,

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h
index fa014cee7e21d766d153011a4f680321bd8442ca..ffcbd9a257480226aaad61dab9e2aa996d7485d2 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.h
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h
@@ -12,7 +12,6 @@
 #include "dp_catalog.h"
 
 struct dp_ctrl {
-       atomic_t aborted;
        bool wide_bus_en;
 };
 

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index f4f5aed7b9c5a1fa13c285a7fde929b5b9d8ae56..672a7ba52edaddf6985f2f0e9086a32d62538e1c 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -74,7 +74,6 @@ struct dp_event {
 };
 
 struct dp_display_private {
-       char *name;
        int irq;
 
        unsigned int id;
@@ -82,11 +81,9 @@ struct dp_display_private {
        /* state variables */
        bool core_initialized;
        bool phy_initialized;
-       bool hpd_irq_on;
        bool audio_supported;
 
        struct drm_device *drm_dev;
-       struct dentry *root;
 
        struct dp_catalog *catalog;
        struct drm_dp_aux *aux;
@@ -809,7 +806,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display,
 
        drm_mode_copy(&dp->panel->dp_mode.drm_mode, &mode->drm_mode);
        dp->panel->dp_mode.bpp = mode->bpp;
-       dp->panel->dp_mode.capabilities = mode->capabilities;
        dp->panel->dp_mode.out_fmt_is_yuv_420 = mode->out_fmt_is_yuv_420;
        dp_panel_init_panel_info(dp->panel);
        return 0;
@@ -1288,7 +1284,6 @@ static int dp_display_probe(struct platform_device *pdev)
                return -EINVAL;
 
        dp->dp_display.pdev = pdev;
-       dp->name = "drm_dp";
        dp->id = desc->id;
        dp->dp_display.connector_type = dp_display_get_connector_type(pdev, desc);
        dp->wide_bus_supported = desc->wide_bus_supported;

diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 234dada88687dcec2764319d44f6ea68999d0c57..ec7fa67e0569eeb00e121b91de8026472afcac8d 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -16,7 +16,6 @@ struct msm_dp {
        struct drm_device *drm_dev;
        struct platform_device *pdev;
        struct device *codec_dev;
-       struct drm_bridge *bridge;
        struct drm_connector *connector;
        struct drm_bridge *next_bridge;
        bool link_ready;
@@ -28,8 +27,6 @@ struct msm_dp {
 
        hdmi_codec_plugged_cb plugged_cb;
 
-       bool wide_bus_en;
-
        struct dp_audio *dp_audio;
        bool psr_supported;
 };

diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index a819a4ff76a9f1ecbf208663e78020feb5a5e525..1b9be5bd97f12d29a6c2846f5ad94015e987f0bf 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -347,8 +347,6 @@ int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
                }
        }
 
-       dp_display->bridge = bridge;
-
        return 0;
 }
 

diff --git a/drivers/gpu/drm/msm/dp/dp_link.c b/drivers/gpu/drm/msm/dp/dp_link.c
index ea911d9244be7e5850861cefeabd61304e0419cd..d8967615d84d42f614e268089972f9d12302af5d 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_link.c
+++ b/drivers/gpu/drm/msm/dp/dp_link.c
@@ -36,7 +36,6 @@ struct dp_link_request {
 
 struct dp_link_private {
        u32 prev_sink_count;
-       struct device *dev;
        struct drm_device *drm_dev;
        struct drm_dp_aux *aux;
        struct dp_link dp_link;
@@ -804,8 +803,6 @@ int dp_link_psm_config(struct dp_link *dp_link,
        if (ret)
                DRM_ERROR("Failed to %s low power mode\n", enable ?
                                                        "enter" : "exit");
-       else
-               dp_link->psm_enabled = enable;
 
        mutex_unlock(&link->psm_mutex);
        return ret;
@@ -1226,7 +1223,6 @@ struct dp_link *dp_link_get(struct device *dev, struct drm_dp_aux *aux)
        if (!link)
                return ERR_PTR(-ENOMEM);
 
-       link->dev   = dev;
        link->aux   = aux;
 
        mutex_init(&link->psm_mutex);

diff --git a/drivers/gpu/drm/msm/dp/dp_link.h b/drivers/gpu/drm/msm/dp/dp_link.h
index 42aed9c90b7320ebe2f2ff49f1b78cc0fd220d38..5846337bb56f3ec0d3e5e456cf6de49f3644f1d3 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_link.h
+++ b/drivers/gpu/drm/msm/dp/dp_link.h
@@ -62,7 +62,6 @@ struct dp_link_phy_params {
 struct dp_link {
        u32 sink_request;
        u32 test_response;
-       bool psm_enabled;
 
        u8 sink_count;
        struct dp_link_test_video test_video;

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 9afd99e00b0c8db4c1d08ba156282913d269a2be..4ea42fa936ae439308bcee08a1ae6434ec84f1c8 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -15,7 +15,6 @@ struct edid;
 
 struct dp_display_mode {
        struct drm_display_mode drm_mode;
-       u32 capabilities;
        u32 bpp;
        u32 h_active_low;
        u32 v_active_low;
@@ -47,7 +46,6 @@ struct dp_panel {
        bool video_test;
        bool vsc_sdp_supported;
 
-       u32 vic;
        u32 max_dp_lanes;
        u32 max_dp_link_rate;