* [PATCH v2 1/3] drm/msm/dp: remove unused stubs
@ 2022-06-17 23:24 ` Dmitry Baryshkov
0 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson,
linux-arm-msm, dri-devel, freedreno
Refactoring DP code transformed several functions into empty stubs.
Remove them.
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/dp/dp_display.c | 35 -----------------------------
1 file changed, 35 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 08e3f0b1b395..fea610793dc4 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display,
return 0;
}
-static int dp_display_prepare(struct msm_dp *dp_display)
-{
- return 0;
-}
-
static int dp_display_enable(struct dp_display_private *dp, u32 data)
{
int rc = 0;
@@ -938,11 +933,6 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data)
return 0;
}
-static int dp_display_unprepare(struct msm_dp *dp_display)
-{
- return 0;
-}
-
int dp_display_set_plugged_cb(struct msm_dp *dp_display,
hdmi_codec_plugged_cb fn, struct device *codec_dev)
{
@@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev)
return 0;
}
-static int dp_pm_prepare(struct device *dev)
-{
- return 0;
-}
-
-static void dp_pm_complete(struct device *dev)
-{
-
-}
-
static const struct dev_pm_ops dp_pm_ops = {
.suspend = dp_pm_suspend,
.resume = dp_pm_resume,
- .prepare = dp_pm_prepare,
- .complete = dp_pm_complete,
};
static struct platform_driver dp_display_driver = {
@@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
return;
}
- rc = dp_display_prepare(dp);
- if (rc) {
- DRM_ERROR("DP display prepare failed, rc=%d\n", rc);
- mutex_unlock(&dp_display->event_mutex);
- return;
- }
-
state = dp_display->hpd_state;
if (state == ST_DISPLAY_OFF) {
@@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
if (rc) {
DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
dp_display_disable(dp_display, 0);
- dp_display_unprepare(dp);
}
/* completed connection */
@@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
{
struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge);
struct msm_dp *dp = dp_bridge->dp_display;
- int rc = 0;
u32 state;
struct dp_display_private *dp_display;
@@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
dp_display_disable(dp_display, 0);
- rc = dp_display_unprepare(dp);
- if (rc)
- DRM_ERROR("DP display unprepare failed, rc=%d\n", rc);
-
state = dp_display->hpd_state;
if (state == ST_DISCONNECT_PENDING) {
/* completed disconnection */
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 1/3] drm/msm/dp: remove unused stubs
@ 2022-06-17 23:24 ` Dmitry Baryshkov
0 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Stephen Boyd, freedreno
Refactoring DP code transformed several functions into empty stubs.
Remove them.
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/dp/dp_display.c | 35 -----------------------------
1 file changed, 35 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 08e3f0b1b395..fea610793dc4 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display,
return 0;
}
-static int dp_display_prepare(struct msm_dp *dp_display)
-{
- return 0;
-}
-
static int dp_display_enable(struct dp_display_private *dp, u32 data)
{
int rc = 0;
@@ -938,11 +933,6 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data)
return 0;
}
-static int dp_display_unprepare(struct msm_dp *dp_display)
-{
- return 0;
-}
-
int dp_display_set_plugged_cb(struct msm_dp *dp_display,
hdmi_codec_plugged_cb fn, struct device *codec_dev)
{
@@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev)
return 0;
}
-static int dp_pm_prepare(struct device *dev)
-{
- return 0;
-}
-
-static void dp_pm_complete(struct device *dev)
-{
-
-}
-
static const struct dev_pm_ops dp_pm_ops = {
.suspend = dp_pm_suspend,
.resume = dp_pm_resume,
- .prepare = dp_pm_prepare,
- .complete = dp_pm_complete,
};
static struct platform_driver dp_display_driver = {
@@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
return;
}
- rc = dp_display_prepare(dp);
- if (rc) {
- DRM_ERROR("DP display prepare failed, rc=%d\n", rc);
- mutex_unlock(&dp_display->event_mutex);
- return;
- }
-
state = dp_display->hpd_state;
if (state == ST_DISPLAY_OFF) {
@@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
if (rc) {
DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
dp_display_disable(dp_display, 0);
- dp_display_unprepare(dp);
}
/* completed connection */
@@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
{
struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge);
struct msm_dp *dp = dp_bridge->dp_display;
- int rc = 0;
u32 state;
struct dp_display_private *dp_display;
@@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
dp_display_disable(dp_display, 0);
- rc = dp_display_unprepare(dp);
- if (rc)
- DRM_ERROR("DP display unprepare failed, rc=%d\n", rc);
-
state = dp_display->hpd_state;
if (state == ST_DISCONNECT_PENDING) {
/* completed disconnection */
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument
2022-06-17 23:24 ` Dmitry Baryshkov
@ 2022-06-17 23:24 ` Dmitry Baryshkov
-1 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson,
linux-arm-msm, dri-devel, freedreno
To follow up recent changes, rename (and change type of) second
dp_display_enable()'s argument from generic u32 data to bool
force_link_train, which is later passed to dp_ctrl_on_stream().
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Changes since v1:
- Added patch
---
drivers/gpu/drm/msm/dp/dp_display.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index fea610793dc4..96defacc92dc 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -608,7 +608,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
return 0;
};
-static int dp_display_enable(struct dp_display_private *dp, u32 data);
+static int dp_display_enable(struct dp_display_private *dp, bool force_link_train);
static int dp_display_disable(struct dp_display_private *dp, u32 data);
static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
@@ -857,7 +857,7 @@ static int dp_display_set_mode(struct msm_dp *dp_display,
return 0;
}
-static int dp_display_enable(struct dp_display_private *dp, u32 data)
+static int dp_display_enable(struct dp_display_private *dp, bool force_link_train)
{
int rc = 0;
struct msm_dp *dp_display = &dp->dp_display;
@@ -868,7 +868,7 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data)
return 0;
}
- rc = dp_ctrl_on_stream(dp->ctrl, data);
+ rc = dp_ctrl_on_stream(dp->ctrl, force_link_train);
if (!rc)
dp_display->power_on = true;
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument
@ 2022-06-17 23:24 ` Dmitry Baryshkov
0 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Stephen Boyd, freedreno
To follow up recent changes, rename (and change type of) second
dp_display_enable()'s argument from generic u32 data to bool
force_link_train, which is later passed to dp_ctrl_on_stream().
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Changes since v1:
- Added patch
---
drivers/gpu/drm/msm/dp/dp_display.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index fea610793dc4..96defacc92dc 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -608,7 +608,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
return 0;
};
-static int dp_display_enable(struct dp_display_private *dp, u32 data);
+static int dp_display_enable(struct dp_display_private *dp, bool force_link_train);
static int dp_display_disable(struct dp_display_private *dp, u32 data);
static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
@@ -857,7 +857,7 @@ static int dp_display_set_mode(struct msm_dp *dp_display,
return 0;
}
-static int dp_display_enable(struct dp_display_private *dp, u32 data)
+static int dp_display_enable(struct dp_display_private *dp, bool force_link_train)
{
int rc = 0;
struct msm_dp *dp_display = &dp->dp_display;
@@ -868,7 +868,7 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data)
return 0;
}
- rc = dp_ctrl_on_stream(dp->ctrl, data);
+ rc = dp_ctrl_on_stream(dp->ctrl, force_link_train);
if (!rc)
dp_display->power_on = true;
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread[parent not found: <b88142b5-2614-23e6-75fd-46f864716fd7@quicinc.com>]
* Re: Fwd: [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument
[not found] ` <b88142b5-2614-23e6-75fd-46f864716fd7@quicinc.com>
@ 2022-06-28 15:39 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:39 UTC (permalink / raw)
To: dmitry.baryshkov, Rob Clark, Sean Paul, Abhinav Kumar
Cc: Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson,
linux-arm-msm, dri-devel, freedreno
On 6/24/2022 10:36 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [PATCH v2 2/3] drm/msm/dp: rename second
> dp_display_enable()'s argument
> Date: Sat, 18 Jun 2022 02:24:33 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: Stephen Boyd <swboyd@chromium.org>, David Airlie
> <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson
> <bjorn.andersson@linaro.org>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org
>
> To follow up recent changes, rename (and change type of) second
> dp_display_enable()'s argument from generic u32 data to bool
> force_link_train, which is later passed to dp_ctrl_on_stream().
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> Changes since v1:
> - Added patch
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index fea610793dc4..96defacc92dc 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -608,7 +608,7 @@ static int dp_hpd_plug_handle(struct
> dp_display_private *dp, u32 data)
> return 0;
> };
> -static int dp_display_enable(struct dp_display_private *dp, u32 data);
> +static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train);
> static int dp_display_disable(struct dp_display_private *dp, u32 data);
> static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
> @@ -857,7 +857,7 @@ static int dp_display_set_mode(struct msm_dp
> *dp_display,
> return 0;
> }
> -static int dp_display_enable(struct dp_display_private *dp, u32 data)
> +static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train)
> {
> int rc = 0;
> struct msm_dp *dp_display = &dp->dp_display;
> @@ -868,7 +868,7 @@ static int dp_display_enable(struct
> dp_display_private *dp, u32 data)
> return 0;
> }
> - rc = dp_ctrl_on_stream(dp->ctrl, data);
> + rc = dp_ctrl_on_stream(dp->ctrl, force_link_train);
> if (!rc)
> dp_display->power_on = true;
> -- 2.35.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument
@ 2022-06-28 15:39 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:39 UTC (permalink / raw)
To: dmitry.baryshkov, Rob Clark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Stephen Boyd, freedreno
On 6/24/2022 10:36 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [PATCH v2 2/3] drm/msm/dp: rename second
> dp_display_enable()'s argument
> Date: Sat, 18 Jun 2022 02:24:33 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: Stephen Boyd <swboyd@chromium.org>, David Airlie
> <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson
> <bjorn.andersson@linaro.org>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org
>
> To follow up recent changes, rename (and change type of) second
> dp_display_enable()'s argument from generic u32 data to bool
> force_link_train, which is later passed to dp_ctrl_on_stream().
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> Changes since v1:
> - Added patch
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index fea610793dc4..96defacc92dc 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -608,7 +608,7 @@ static int dp_hpd_plug_handle(struct
> dp_display_private *dp, u32 data)
> return 0;
> };
> -static int dp_display_enable(struct dp_display_private *dp, u32 data);
> +static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train);
> static int dp_display_disable(struct dp_display_private *dp, u32 data);
> static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
> @@ -857,7 +857,7 @@ static int dp_display_set_mode(struct msm_dp
> *dp_display,
> return 0;
> }
> -static int dp_display_enable(struct dp_display_private *dp, u32 data)
> +static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train)
> {
> int rc = 0;
> struct msm_dp *dp_display = &dp->dp_display;
> @@ -868,7 +868,7 @@ static int dp_display_enable(struct
> dp_display_private *dp, u32 data)
> return 0;
> }
> - rc = dp_ctrl_on_stream(dp->ctrl, data);
> + rc = dp_ctrl_on_stream(dp->ctrl, force_link_train);
> if (!rc)
> dp_display->power_on = true;
> -- 2.35.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument
2022-06-17 23:24 ` Dmitry Baryshkov
@ 2022-06-17 23:24 ` Dmitry Baryshkov
-1 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson,
linux-arm-msm, dri-devel, freedreno
Remove unused dp_display_en/disable prototypes. While we are at it,
remove extra 'data' argument that is unused.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Changes since v1:
- Rebased and dropped the dp_display_enable() chunk
---
drivers/gpu/drm/msm/dp/dp_display.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 96defacc92dc..c17a799d3009 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -608,9 +608,6 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
return 0;
};
-static int dp_display_enable(struct dp_display_private *dp, bool force_link_train);
-static int dp_display_disable(struct dp_display_private *dp, u32 data);
-
static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
bool plugged)
{
@@ -894,7 +891,7 @@ static int dp_display_post_enable(struct msm_dp *dp_display)
return 0;
}
-static int dp_display_disable(struct dp_display_private *dp, u32 data)
+static int dp_display_disable(struct dp_display_private *dp)
{
struct msm_dp *dp_display = &dp->dp_display;
@@ -1676,7 +1673,7 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
rc = dp_display_post_enable(dp);
if (rc) {
DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
- dp_display_disable(dp_display, 0);
+ dp_display_disable(dp_display);
}
/* completed connection */
@@ -1717,7 +1714,7 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
return;
}
- dp_display_disable(dp_display, 0);
+ dp_display_disable(dp_display);
state = dp_display->hpd_state;
if (state == ST_DISCONNECT_PENDING) {
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument
@ 2022-06-17 23:24 ` Dmitry Baryshkov
0 siblings, 0 replies; 12+ messages in thread
From: Dmitry Baryshkov @ 2022-06-17 23:24 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Stephen Boyd, freedreno
Remove unused dp_display_en/disable prototypes. While we are at it,
remove extra 'data' argument that is unused.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Changes since v1:
- Rebased and dropped the dp_display_enable() chunk
---
drivers/gpu/drm/msm/dp/dp_display.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 96defacc92dc..c17a799d3009 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -608,9 +608,6 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
return 0;
};
-static int dp_display_enable(struct dp_display_private *dp, bool force_link_train);
-static int dp_display_disable(struct dp_display_private *dp, u32 data);
-
static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
bool plugged)
{
@@ -894,7 +891,7 @@ static int dp_display_post_enable(struct msm_dp *dp_display)
return 0;
}
-static int dp_display_disable(struct dp_display_private *dp, u32 data)
+static int dp_display_disable(struct dp_display_private *dp)
{
struct msm_dp *dp_display = &dp->dp_display;
@@ -1676,7 +1673,7 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge)
rc = dp_display_post_enable(dp);
if (rc) {
DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
- dp_display_disable(dp_display, 0);
+ dp_display_disable(dp_display);
}
/* completed connection */
@@ -1717,7 +1714,7 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge)
return;
}
- dp_display_disable(dp_display, 0);
+ dp_display_disable(dp_display);
state = dp_display->hpd_state;
if (state == ST_DISCONNECT_PENDING) {
--
2.35.1
^ permalink raw reply related [flat|nested] 12+ messages in thread[parent not found: <c60af04c-4985-88de-5110-341fa985b276@quicinc.com>]
* Re: Fwd: [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument
[not found] ` <c60af04c-4985-88de-5110-341fa985b276@quicinc.com>
@ 2022-06-28 15:41 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:41 UTC (permalink / raw)
To: Dmitry Baryshkov, Rob Clark, Sean Paul, Abhinav Kumar
Cc: Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson,
linux-arm-msm, dri-devel, freedreno
On 6/24/2022 10:37 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable
> prototypes and data argument
> Date: Sat, 18 Jun 2022 02:24:34 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: Stephen Boyd <swboyd@chromium.org>, David Airlie
> <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson
> <bjorn.andersson@linaro.org>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org
>
> Remove unused dp_display_en/disable prototypes. While we are at it,
> remove extra 'data' argument that is unused.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> Changes since v1:
> - Rebased and dropped the dp_display_enable() chunk
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 96defacc92dc..c17a799d3009 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -608,9 +608,6 @@ static int dp_hpd_plug_handle(struct
> dp_display_private *dp, u32 data)
> return 0;
> };
> -static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train);
> -static int dp_display_disable(struct dp_display_private *dp, u32 data);
> -
> static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
> bool plugged)
> {
> @@ -894,7 +891,7 @@ static int dp_display_post_enable(struct msm_dp
> *dp_display)
> return 0;
> }
> -static int dp_display_disable(struct dp_display_private *dp, u32 data)
> +static int dp_display_disable(struct dp_display_private *dp)
> {
> struct msm_dp *dp_display = &dp->dp_display;
> @@ -1676,7 +1673,7 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> rc = dp_display_post_enable(dp);
> if (rc) {
> DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
> - dp_display_disable(dp_display, 0);
> + dp_display_disable(dp_display);
> }
> /* completed connection */
> @@ -1717,7 +1714,7 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> return;
> }
> - dp_display_disable(dp_display, 0);
> + dp_display_disable(dp_display);
> state = dp_display->hpd_state;
> if (state == ST_DISCONNECT_PENDING) {
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument
@ 2022-06-28 15:41 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:41 UTC (permalink / raw)
To: Dmitry Baryshkov, Rob Clark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Stephen Boyd, freedreno
On 6/24/2022 10:37 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable
> prototypes and data argument
> Date: Sat, 18 Jun 2022 02:24:34 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: Stephen Boyd <swboyd@chromium.org>, David Airlie
> <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson
> <bjorn.andersson@linaro.org>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org
>
> Remove unused dp_display_en/disable prototypes. While we are at it,
> remove extra 'data' argument that is unused.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> Changes since v1:
> - Rebased and dropped the dp_display_enable() chunk
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 96defacc92dc..c17a799d3009 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -608,9 +608,6 @@ static int dp_hpd_plug_handle(struct
> dp_display_private *dp, u32 data)
> return 0;
> };
> -static int dp_display_enable(struct dp_display_private *dp, bool
> force_link_train);
> -static int dp_display_disable(struct dp_display_private *dp, u32 data);
> -
> static void dp_display_handle_plugged_change(struct msm_dp *dp_display,
> bool plugged)
> {
> @@ -894,7 +891,7 @@ static int dp_display_post_enable(struct msm_dp
> *dp_display)
> return 0;
> }
> -static int dp_display_disable(struct dp_display_private *dp, u32 data)
> +static int dp_display_disable(struct dp_display_private *dp)
> {
> struct msm_dp *dp_display = &dp->dp_display;
> @@ -1676,7 +1673,7 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> rc = dp_display_post_enable(dp);
> if (rc) {
> DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
> - dp_display_disable(dp_display, 0);
> + dp_display_disable(dp_display);
> }
> /* completed connection */
> @@ -1717,7 +1714,7 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> return;
> }
> - dp_display_disable(dp_display, 0);
> + dp_display_disable(dp_display);
> state = dp_display->hpd_state;
> if (state == ST_DISCONNECT_PENDING) {
^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <9b5b6fed-cd42-fd38-a1ff-58cb590482fe@quicinc.com>]
* Re: Fwd: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs
[not found] ` <9b5b6fed-cd42-fd38-a1ff-58cb590482fe@quicinc.com>
@ 2022-06-28 15:37 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:37 UTC (permalink / raw)
To: dmitry.baryshkov, robdclark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd,
Bjorn Andersson, freedreno
On 6/24/2022 10:36 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs
> Date: Sat, 18 Jun 2022 02:24:32 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, Bjorn Andersson
> <bjorn.andersson@linaro.org>, Daniel Vetter <daniel@ffwll.ch>, Stephen
> Boyd <swboyd@chromium.org>, freedreno@lists.freedesktop.org
>
> Refactoring DP code transformed several functions into empty stubs.
> Remove them.
>
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 35 -----------------------------
> 1 file changed, 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 08e3f0b1b395..fea610793dc4 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp
> *dp_display,
> return 0;
> }
> -static int dp_display_prepare(struct msm_dp *dp_display)
> -{
> - return 0;
> -}
> -
> static int dp_display_enable(struct dp_display_private *dp, u32 data)
> {
> int rc = 0;
> @@ -938,11 +933,6 @@ static int dp_display_disable(struct
> dp_display_private *dp, u32 data)
> return 0;
> }
> -static int dp_display_unprepare(struct msm_dp *dp_display)
> -{
> - return 0;
> -}
> -
> int dp_display_set_plugged_cb(struct msm_dp *dp_display,
> hdmi_codec_plugged_cb fn, struct device *codec_dev)
> {
> @@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev)
> return 0;
> }
> -static int dp_pm_prepare(struct device *dev)
> -{
> - return 0;
> -}
> -
> -static void dp_pm_complete(struct device *dev)
> -{
> -
> -}
> -
> static const struct dev_pm_ops dp_pm_ops = {
> .suspend = dp_pm_suspend,
> .resume = dp_pm_resume,
> - .prepare = dp_pm_prepare,
> - .complete = dp_pm_complete,
> };
> static struct platform_driver dp_display_driver = {
> @@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> return;
> }
> - rc = dp_display_prepare(dp);
> - if (rc) {
> - DRM_ERROR("DP display prepare failed, rc=%d\n", rc);
> - mutex_unlock(&dp_display->event_mutex);
> - return;
> - }
> -
> state = dp_display->hpd_state;
> if (state == ST_DISPLAY_OFF) {
> @@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> if (rc) {
> DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
> dp_display_disable(dp_display, 0);
> - dp_display_unprepare(dp);
> }
> /* completed connection */
> @@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> {
> struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge);
> struct msm_dp *dp = dp_bridge->dp_display;
> - int rc = 0;
> u32 state;
> struct dp_display_private *dp_display;
> @@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> dp_display_disable(dp_display, 0);
> - rc = dp_display_unprepare(dp);
> - if (rc)
> - DRM_ERROR("DP display unprepare failed, rc=%d\n", rc);
> -
> state = dp_display->hpd_state;
> if (state == ST_DISCONNECT_PENDING) {
> /* completed disconnection */
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: Fwd: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs
@ 2022-06-28 15:37 ` Kuogee Hsieh
0 siblings, 0 replies; 12+ messages in thread
From: Kuogee Hsieh @ 2022-06-28 15:37 UTC (permalink / raw)
To: dmitry.baryshkov, robdclark, Sean Paul, Abhinav Kumar
Cc: David Airlie, linux-arm-msm, dri-devel, Bjorn Andersson,
Daniel Vetter, Stephen Boyd, freedreno
On 6/24/2022 10:36 AM, Abhinav Kumar wrote:
>
>
>
> -------- Forwarded Message --------
> Subject: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs
> Date: Sat, 18 Jun 2022 02:24:32 +0300
> From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
> Abhinav Kumar <quic_abhinavk@quicinc.com>
> CC: David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org,
> dri-devel@lists.freedesktop.org, Bjorn Andersson
> <bjorn.andersson@linaro.org>, Daniel Vetter <daniel@ffwll.ch>, Stephen
> Boyd <swboyd@chromium.org>, freedreno@lists.freedesktop.org
>
> Refactoring DP code transformed several functions into empty stubs.
> Remove them.
>
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 35 -----------------------------
> 1 file changed, 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 08e3f0b1b395..fea610793dc4 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp
> *dp_display,
> return 0;
> }
> -static int dp_display_prepare(struct msm_dp *dp_display)
> -{
> - return 0;
> -}
> -
> static int dp_display_enable(struct dp_display_private *dp, u32 data)
> {
> int rc = 0;
> @@ -938,11 +933,6 @@ static int dp_display_disable(struct
> dp_display_private *dp, u32 data)
> return 0;
> }
> -static int dp_display_unprepare(struct msm_dp *dp_display)
> -{
> - return 0;
> -}
> -
> int dp_display_set_plugged_cb(struct msm_dp *dp_display,
> hdmi_codec_plugged_cb fn, struct device *codec_dev)
> {
> @@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev)
> return 0;
> }
> -static int dp_pm_prepare(struct device *dev)
> -{
> - return 0;
> -}
> -
> -static void dp_pm_complete(struct device *dev)
> -{
> -
> -}
> -
> static const struct dev_pm_ops dp_pm_ops = {
> .suspend = dp_pm_suspend,
> .resume = dp_pm_resume,
> - .prepare = dp_pm_prepare,
> - .complete = dp_pm_complete,
> };
> static struct platform_driver dp_display_driver = {
> @@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> return;
> }
> - rc = dp_display_prepare(dp);
> - if (rc) {
> - DRM_ERROR("DP display prepare failed, rc=%d\n", rc);
> - mutex_unlock(&dp_display->event_mutex);
> - return;
> - }
> -
> state = dp_display->hpd_state;
> if (state == ST_DISPLAY_OFF) {
> @@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge
> *drm_bridge)
> if (rc) {
> DRM_ERROR("DP display post enable failed, rc=%d\n", rc);
> dp_display_disable(dp_display, 0);
> - dp_display_unprepare(dp);
> }
> /* completed connection */
> @@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> {
> struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge);
> struct msm_dp *dp = dp_bridge->dp_display;
> - int rc = 0;
> u32 state;
> struct dp_display_private *dp_display;
> @@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge
> *drm_bridge)
> dp_display_disable(dp_display, 0);
> - rc = dp_display_unprepare(dp);
> - if (rc)
> - DRM_ERROR("DP display unprepare failed, rc=%d\n", rc);
> -
> state = dp_display->hpd_state;
> if (state == ST_DISCONNECT_PENDING) {
> /* completed disconnection */
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-06-28 15:41 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 23:24 [PATCH v2 1/3] drm/msm/dp: remove unused stubs Dmitry Baryshkov
2022-06-17 23:24 ` Dmitry Baryshkov
2022-06-17 23:24 ` [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument Dmitry Baryshkov
2022-06-17 23:24 ` Dmitry Baryshkov
[not found] ` <b88142b5-2614-23e6-75fd-46f864716fd7@quicinc.com>
2022-06-28 15:39 ` Fwd: " Kuogee Hsieh
2022-06-28 15:39 ` Kuogee Hsieh
2022-06-17 23:24 ` [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument Dmitry Baryshkov
2022-06-17 23:24 ` Dmitry Baryshkov
[not found] ` <c60af04c-4985-88de-5110-341fa985b276@quicinc.com>
2022-06-28 15:41 ` Fwd: " Kuogee Hsieh
2022-06-28 15:41 ` Kuogee Hsieh
[not found] ` <9b5b6fed-cd42-fd38-a1ff-58cb590482fe@quicinc.com>
2022-06-28 15:37 ` Fwd: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs Kuogee Hsieh
2022-06-28 15:37 ` Kuogee Hsieh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.