Commit 670574c9 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Dmitry Baryshkov

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn 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.comSigned-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 3306a13a
...@@ -22,9 +22,7 @@ struct dp_audio_private { ...@@ -22,9 +22,7 @@ struct dp_audio_private {
struct platform_device *pdev; struct platform_device *pdev;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct dp_catalog *catalog; struct dp_catalog *catalog;
struct dp_panel *panel;
bool engine_on;
u32 channels; u32 channels;
struct dp_audio dp_audio; struct dp_audio dp_audio;
...@@ -356,8 +354,6 @@ static void dp_audio_enable(struct dp_audio_private *audio, bool enable) ...@@ -356,8 +354,6 @@ static void dp_audio_enable(struct dp_audio_private *audio, bool enable)
catalog->audio_data = enable; catalog->audio_data = enable;
dp_catalog_audio_enable(catalog); dp_catalog_audio_enable(catalog);
audio->engine_on = enable;
} }
static struct dp_audio_private *dp_audio_get_data(struct platform_device *pdev) 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, ...@@ -571,7 +567,6 @@ struct dp_audio *dp_audio_get(struct platform_device *pdev,
} }
audio->pdev = pdev; audio->pdev = pdev;
audio->panel = panel;
audio->catalog = catalog; audio->catalog = catalog;
dp_audio = &audio->dp_audio; dp_audio = &audio->dp_audio;
......
...@@ -81,7 +81,6 @@ struct dp_catalog_private { ...@@ -81,7 +81,6 @@ struct dp_catalog_private {
struct dss_io_data io; struct dss_io_data io;
u32 (*audio_map)[DP_AUDIO_SDP_HEADER_MAX]; u32 (*audio_map)[DP_AUDIO_SDP_HEADER_MAX];
struct dp_catalog dp_catalog; 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) void dp_catalog_snapshot(struct dp_catalog *dp_catalog, struct msm_disp_state *disp_state)
......
...@@ -28,26 +28,9 @@ ...@@ -28,26 +28,9 @@
#define DP_INTR_FRAME_END BIT(6) #define DP_INTR_FRAME_END BIT(6)
#define DP_INTR_CRC_UPDATED BIT(9) #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_0 0x10000000
#define DP_HW_VERSION_1_2 0x10020000 #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 { enum dp_catalog_audio_sdp_type {
DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_STREAM,
DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_TIMESTAMP,
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "dp_catalog.h" #include "dp_catalog.h"
struct dp_ctrl { struct dp_ctrl {
atomic_t aborted;
bool wide_bus_en; bool wide_bus_en;
}; };
......
...@@ -74,7 +74,6 @@ struct dp_event { ...@@ -74,7 +74,6 @@ struct dp_event {
}; };
struct dp_display_private { struct dp_display_private {
char *name;
int irq; int irq;
unsigned int id; unsigned int id;
...@@ -82,11 +81,9 @@ struct dp_display_private { ...@@ -82,11 +81,9 @@ struct dp_display_private {
/* state variables */ /* state variables */
bool core_initialized; bool core_initialized;
bool phy_initialized; bool phy_initialized;
bool hpd_irq_on;
bool audio_supported; bool audio_supported;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct dentry *root;
struct dp_catalog *catalog; struct dp_catalog *catalog;
struct drm_dp_aux *aux; struct drm_dp_aux *aux;
...@@ -809,7 +806,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display, ...@@ -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); drm_mode_copy(&dp->panel->dp_mode.drm_mode, &mode->drm_mode);
dp->panel->dp_mode.bpp = mode->bpp; 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->dp_mode.out_fmt_is_yuv_420 = mode->out_fmt_is_yuv_420;
dp_panel_init_panel_info(dp->panel); dp_panel_init_panel_info(dp->panel);
return 0; return 0;
...@@ -1288,7 +1284,6 @@ static int dp_display_probe(struct platform_device *pdev) ...@@ -1288,7 +1284,6 @@ static int dp_display_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
dp->dp_display.pdev = pdev; dp->dp_display.pdev = pdev;
dp->name = "drm_dp";
dp->id = desc->id; dp->id = desc->id;
dp->dp_display.connector_type = dp_display_get_connector_type(pdev, desc); dp->dp_display.connector_type = dp_display_get_connector_type(pdev, desc);
dp->wide_bus_supported = desc->wide_bus_supported; dp->wide_bus_supported = desc->wide_bus_supported;
......
...@@ -16,7 +16,6 @@ struct msm_dp { ...@@ -16,7 +16,6 @@ struct msm_dp {
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct platform_device *pdev; struct platform_device *pdev;
struct device *codec_dev; struct device *codec_dev;
struct drm_bridge *bridge;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_bridge *next_bridge; struct drm_bridge *next_bridge;
bool link_ready; bool link_ready;
...@@ -28,8 +27,6 @@ struct msm_dp { ...@@ -28,8 +27,6 @@ struct msm_dp {
hdmi_codec_plugged_cb plugged_cb; hdmi_codec_plugged_cb plugged_cb;
bool wide_bus_en;
struct dp_audio *dp_audio; struct dp_audio *dp_audio;
bool psr_supported; bool psr_supported;
}; };
......
...@@ -347,8 +347,6 @@ int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev, ...@@ -347,8 +347,6 @@ int dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
} }
} }
dp_display->bridge = bridge;
return 0; return 0;
} }
......
...@@ -36,7 +36,6 @@ struct dp_link_request { ...@@ -36,7 +36,6 @@ struct dp_link_request {
struct dp_link_private { struct dp_link_private {
u32 prev_sink_count; u32 prev_sink_count;
struct device *dev;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct drm_dp_aux *aux; struct drm_dp_aux *aux;
struct dp_link dp_link; struct dp_link dp_link;
...@@ -804,8 +803,6 @@ int dp_link_psm_config(struct dp_link *dp_link, ...@@ -804,8 +803,6 @@ int dp_link_psm_config(struct dp_link *dp_link,
if (ret) if (ret)
DRM_ERROR("Failed to %s low power mode\n", enable ? DRM_ERROR("Failed to %s low power mode\n", enable ?
"enter" : "exit"); "enter" : "exit");
else
dp_link->psm_enabled = enable;
mutex_unlock(&link->psm_mutex); mutex_unlock(&link->psm_mutex);
return ret; return ret;
...@@ -1226,7 +1223,6 @@ struct dp_link *dp_link_get(struct device *dev, struct drm_dp_aux *aux) ...@@ -1226,7 +1223,6 @@ struct dp_link *dp_link_get(struct device *dev, struct drm_dp_aux *aux)
if (!link) if (!link)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
link->dev = dev;
link->aux = aux; link->aux = aux;
mutex_init(&link->psm_mutex); mutex_init(&link->psm_mutex);
......
...@@ -62,7 +62,6 @@ struct dp_link_phy_params { ...@@ -62,7 +62,6 @@ struct dp_link_phy_params {
struct dp_link { struct dp_link {
u32 sink_request; u32 sink_request;
u32 test_response; u32 test_response;
bool psm_enabled;
u8 sink_count; u8 sink_count;
struct dp_link_test_video test_video; struct dp_link_test_video test_video;
......
...@@ -15,7 +15,6 @@ struct edid; ...@@ -15,7 +15,6 @@ struct edid;
struct dp_display_mode { struct dp_display_mode {
struct drm_display_mode drm_mode; struct drm_display_mode drm_mode;
u32 capabilities;
u32 bpp; u32 bpp;
u32 h_active_low; u32 h_active_low;
u32 v_active_low; u32 v_active_low;
...@@ -47,7 +46,6 @@ struct dp_panel { ...@@ -47,7 +46,6 @@ struct dp_panel {
bool video_test; bool video_test;
bool vsc_sdp_supported; bool vsc_sdp_supported;
u32 vic;
u32 max_dp_lanes; u32 max_dp_lanes;
u32 max_dp_link_rate; u32 max_dp_link_rate;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment