All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-23 10:35 ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä

As noted by Ville Syrjälä [1] the dp_connector_get_modes() has weird
on-stack interim copy of the mode. When reviewing the mentioned patch I
noticed that the rest of the code in dp_connector_get_modes() is weird,
unused since September of 2020 and can be removed. This series removes
dead weird code leaving dp_connector_get_modes() simple enough.

[1] https://lore.kernel.org/linux-arm-msm/20220218100403.7028-11-ville.syrjala@linux.intel.com/

*** BLURB HERE ***

Dmitry Baryshkov (3):
  drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  drm/msm/dp: simplify dp_connector_get_modes()
  drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display

 drivers/gpu/drm/msm/dp/dp_debug.c   |  2 --
 drivers/gpu/drm/msm/dp/dp_display.c | 11 +++-------
 drivers/gpu/drm/msm/dp/dp_display.h |  5 +----
 drivers/gpu/drm/msm/dp/dp_drm.c     | 33 ++---------------------------
 drivers/gpu/drm/msm/dp/dp_panel.c   |  2 +-
 drivers/gpu/drm/msm/dp/dp_panel.h   |  3 +--
 6 files changed, 8 insertions(+), 48 deletions(-)

-- 
2.35.1


^ permalink raw reply	[flat|nested] 26+ messages in thread

* [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-23 10:35 ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno

As noted by Ville Syrjälä [1] the dp_connector_get_modes() has weird
on-stack interim copy of the mode. When reviewing the mentioned patch I
noticed that the rest of the code in dp_connector_get_modes() is weird,
unused since September of 2020 and can be removed. This series removes
dead weird code leaving dp_connector_get_modes() simple enough.

[1] https://lore.kernel.org/linux-arm-msm/20220218100403.7028-11-ville.syrjala@linux.intel.com/

*** BLURB HERE ***

Dmitry Baryshkov (3):
  drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  drm/msm/dp: simplify dp_connector_get_modes()
  drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display

 drivers/gpu/drm/msm/dp/dp_debug.c   |  2 --
 drivers/gpu/drm/msm/dp/dp_display.c | 11 +++-------
 drivers/gpu/drm/msm/dp/dp_display.h |  5 +----
 drivers/gpu/drm/msm/dp/dp_drm.c     | 33 ++---------------------------
 drivers/gpu/drm/msm/dp/dp_panel.c   |  2 +-
 drivers/gpu/drm/msm/dp/dp_panel.h   |  3 +--
 6 files changed, 8 insertions(+), 48 deletions(-)

-- 
2.35.1


^ permalink raw reply	[flat|nested] 26+ messages in thread

* [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  2022-03-23 10:35 ` Dmitry Baryshkov
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  -1 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä

Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
the dp_mode argument. Drop it completely.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
 drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
 drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
 3 files 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 178b774a5fbd..3dd790083cf7 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
 	dp_display = container_of(dp, struct dp_display_private, dp_display);
 
 	ret = dp_panel_get_modes(dp_display->panel,
-		dp->connector, dp_mode);
+		dp->connector);
 	if (dp_mode->drm_mode.clock)
 		dp->max_pclk_khz = dp_mode->drm_mode.clock;
 	return ret;
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index f1418722c549..8d7662028f30 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
 }
 
 int dp_panel_get_modes(struct dp_panel *dp_panel,
-	struct drm_connector *connector, struct dp_display_mode *mode)
+	struct drm_connector *connector)
 {
 	if (!dp_panel) {
 		DRM_ERROR("invalid input\n");
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 9023e5bb4b8b..9fa6e524832c 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
 u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
 			u32 mode_pclk_khz);
 int dp_panel_get_modes(struct dp_panel *dp_panel,
-		struct drm_connector *connector, struct dp_display_mode *mode);
+		struct drm_connector *connector);
 void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
 void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno

Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
the dp_mode argument. Drop it completely.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
 drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
 drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
 3 files 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 178b774a5fbd..3dd790083cf7 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
 	dp_display = container_of(dp, struct dp_display_private, dp_display);
 
 	ret = dp_panel_get_modes(dp_display->panel,
-		dp->connector, dp_mode);
+		dp->connector);
 	if (dp_mode->drm_mode.clock)
 		dp->max_pclk_khz = dp_mode->drm_mode.clock;
 	return ret;
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index f1418722c549..8d7662028f30 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
 }
 
 int dp_panel_get_modes(struct dp_panel *dp_panel,
-	struct drm_connector *connector, struct dp_display_mode *mode)
+	struct drm_connector *connector)
 {
 	if (!dp_panel) {
 		DRM_ERROR("invalid input\n");
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 9023e5bb4b8b..9fa6e524832c 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
 u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
 			u32 mode_pclk_khz);
 int dp_panel_get_modes(struct dp_panel *dp_panel,
-		struct drm_connector *connector, struct dp_display_mode *mode);
+		struct drm_connector *connector);
 void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
 void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
  2022-03-23 10:35 ` Dmitry Baryshkov
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  -1 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä

Since dp_panel_get_modes() handling for dp_mode was removed,
dp_display_get_modes also doesn't change the passed dp_mode, drop the
unused dp_mode variable being allocated unused and then freed.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_display.c |  8 ++------
 drivers/gpu/drm/msm/dp/dp_display.h |  3 +--
 drivers/gpu/drm/msm/dp/dp_drm.c     | 29 +----------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 3dd790083cf7..be1e9c558fda 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -999,8 +999,7 @@ int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
 	return MODE_OK;
 }
 
-int dp_display_get_modes(struct msm_dp *dp,
-				struct dp_display_mode *dp_mode)
+int dp_display_get_modes(struct msm_dp *dp)
 {
 	struct dp_display_private *dp_display;
 	int ret = 0;
@@ -1012,11 +1011,8 @@ int dp_display_get_modes(struct msm_dp *dp,
 
 	dp_display = container_of(dp, struct dp_display_private, dp_display);
 
-	ret = dp_panel_get_modes(dp_display->panel,
+	return dp_panel_get_modes(dp_display->panel,
 		dp->connector);
-	if (dp_mode->drm_mode.clock)
-		dp->max_pclk_khz = dp_mode->drm_mode.clock;
-	return ret;
 }
 
 bool dp_display_check_video_test(struct msm_dp *dp)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 7af2b186d2d9..6efb5c853c89 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -33,8 +33,7 @@ struct msm_dp {
 int dp_display_set_plugged_cb(struct msm_dp *dp_display,
 		hdmi_codec_plugged_cb fn, struct device *codec_dev);
 int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
-int dp_display_get_modes(struct msm_dp *dp_display,
-		struct dp_display_mode *dp_mode);
+int dp_display_get_modes(struct msm_dp *dp_display);
 int dp_display_request_irq(struct msm_dp *dp_display);
 bool dp_display_check_video_test(struct msm_dp *dp_display);
 int dp_display_get_test_bpp(struct msm_dp *dp_display);
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 80f59cf99089..af5f1b001192 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -55,49 +55,22 @@ static int dp_connector_get_modes(struct drm_connector *connector)
 {
 	int rc = 0;
 	struct msm_dp *dp;
-	struct dp_display_mode *dp_mode = NULL;
-	struct drm_display_mode *m, drm_mode;
 
 	if (!connector)
 		return 0;
 
 	dp = to_dp_connector(connector)->dp_display;
 
-	dp_mode = kzalloc(sizeof(*dp_mode),  GFP_KERNEL);
-	if (!dp_mode)
-		return 0;
-
 	/* pluggable case assumes EDID is read when HPD */
 	if (dp->is_connected) {
-		/*
-		 *The get_modes() function might return one mode that is stored
-		 * in dp_mode when compliance test is in progress. If not, the
-		 * return value is equal to the total number of modes supported
-		 * by the sink
-		 */
-		rc = dp_display_get_modes(dp, dp_mode);
+		rc = dp_display_get_modes(dp);
 		if (rc <= 0) {
 			DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc);
-			kfree(dp_mode);
 			return rc;
 		}
-		if (dp_mode->drm_mode.clock) { /* valid DP mode */
-			memset(&drm_mode, 0x0, sizeof(drm_mode));
-			drm_mode_copy(&drm_mode, &dp_mode->drm_mode);
-			m = drm_mode_duplicate(connector->dev, &drm_mode);
-			if (!m) {
-				DRM_ERROR("failed to add mode %ux%u\n",
-				       drm_mode.hdisplay,
-				       drm_mode.vdisplay);
-				kfree(dp_mode);
-				return 0;
-			}
-			drm_mode_probed_add(connector, m);
-		}
 	} else {
 		DRM_DEBUG_DP("No sink connected\n");
 	}
-	kfree(dp_mode);
 	return rc;
 }
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno

Since dp_panel_get_modes() handling for dp_mode was removed,
dp_display_get_modes also doesn't change the passed dp_mode, drop the
unused dp_mode variable being allocated unused and then freed.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_display.c |  8 ++------
 drivers/gpu/drm/msm/dp/dp_display.h |  3 +--
 drivers/gpu/drm/msm/dp/dp_drm.c     | 29 +----------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 3dd790083cf7..be1e9c558fda 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -999,8 +999,7 @@ int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
 	return MODE_OK;
 }
 
-int dp_display_get_modes(struct msm_dp *dp,
-				struct dp_display_mode *dp_mode)
+int dp_display_get_modes(struct msm_dp *dp)
 {
 	struct dp_display_private *dp_display;
 	int ret = 0;
@@ -1012,11 +1011,8 @@ int dp_display_get_modes(struct msm_dp *dp,
 
 	dp_display = container_of(dp, struct dp_display_private, dp_display);
 
-	ret = dp_panel_get_modes(dp_display->panel,
+	return dp_panel_get_modes(dp_display->panel,
 		dp->connector);
-	if (dp_mode->drm_mode.clock)
-		dp->max_pclk_khz = dp_mode->drm_mode.clock;
-	return ret;
 }
 
 bool dp_display_check_video_test(struct msm_dp *dp)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 7af2b186d2d9..6efb5c853c89 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -33,8 +33,7 @@ struct msm_dp {
 int dp_display_set_plugged_cb(struct msm_dp *dp_display,
 		hdmi_codec_plugged_cb fn, struct device *codec_dev);
 int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
-int dp_display_get_modes(struct msm_dp *dp_display,
-		struct dp_display_mode *dp_mode);
+int dp_display_get_modes(struct msm_dp *dp_display);
 int dp_display_request_irq(struct msm_dp *dp_display);
 bool dp_display_check_video_test(struct msm_dp *dp_display);
 int dp_display_get_test_bpp(struct msm_dp *dp_display);
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 80f59cf99089..af5f1b001192 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -55,49 +55,22 @@ static int dp_connector_get_modes(struct drm_connector *connector)
 {
 	int rc = 0;
 	struct msm_dp *dp;
-	struct dp_display_mode *dp_mode = NULL;
-	struct drm_display_mode *m, drm_mode;
 
 	if (!connector)
 		return 0;
 
 	dp = to_dp_connector(connector)->dp_display;
 
-	dp_mode = kzalloc(sizeof(*dp_mode),  GFP_KERNEL);
-	if (!dp_mode)
-		return 0;
-
 	/* pluggable case assumes EDID is read when HPD */
 	if (dp->is_connected) {
-		/*
-		 *The get_modes() function might return one mode that is stored
-		 * in dp_mode when compliance test is in progress. If not, the
-		 * return value is equal to the total number of modes supported
-		 * by the sink
-		 */
-		rc = dp_display_get_modes(dp, dp_mode);
+		rc = dp_display_get_modes(dp);
 		if (rc <= 0) {
 			DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc);
-			kfree(dp_mode);
 			return rc;
 		}
-		if (dp_mode->drm_mode.clock) { /* valid DP mode */
-			memset(&drm_mode, 0x0, sizeof(drm_mode));
-			drm_mode_copy(&drm_mode, &dp_mode->drm_mode);
-			m = drm_mode_duplicate(connector->dev, &drm_mode);
-			if (!m) {
-				DRM_ERROR("failed to add mode %ux%u\n",
-				       drm_mode.hdisplay,
-				       drm_mode.vdisplay);
-				kfree(dp_mode);
-				return 0;
-			}
-			drm_mode_probed_add(connector, m);
-		}
 	} else {
 		DRM_DEBUG_DP("No sink connected\n");
 	}
-	kfree(dp_mode);
 	return rc;
 }
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
  2022-03-23 10:35 ` Dmitry Baryshkov
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  -1 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä

Since the last commit, the max_pclk_khz became constant, it's set to
DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
and use DP_MAX_PIXEL_CLK_KHZ directly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_debug.c   | 2 --
 drivers/gpu/drm/msm/dp/dp_display.c | 1 -
 drivers/gpu/drm/msm/dp/dp_display.h | 2 --
 drivers/gpu/drm/msm/dp/dp_drm.c     | 4 +---
 drivers/gpu/drm/msm/dp/dp_panel.h   | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
index 2f9c943f12d5..5e35033ba3e4 100644
--- a/drivers/gpu/drm/msm/dp/dp_debug.c
+++ b/drivers/gpu/drm/msm/dp/dp_debug.c
@@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p)
 	drm_mode = &debug->panel->dp_mode.drm_mode;
 
 	seq_printf(seq, "\tname = %s\n", DEBUG_NAME);
-	seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n",
-			debug->panel->max_pclk_khz);
 	seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n",
 			debug->panel->link_info.rate);
 	seq_printf(seq, "\t\tnum_lanes = %u\n",
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index be1e9c558fda..aeb08416b309 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
 	dp->audio_supported = drm_detect_monitor_audio(edid);
 	dp_panel_handle_sink_request(dp->panel);
 
-	dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ;
 	dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes;
 
 	/*
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 6efb5c853c89..f3a9d7449a1c 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -24,8 +24,6 @@ struct msm_dp {
 
 	hdmi_codec_plugged_cb plugged_cb;
 
-	u32 max_pclk_khz;
-
 	u32 max_dp_lanes;
 	struct dp_audio *dp_audio;
 };
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index af5f1b001192..a94c9b34f397 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
 
 	dp_disp = to_dp_connector(connector)->dp_display;
 
-	if ((dp_disp->max_pclk_khz <= 0) ||
-			(dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
-			(mode->clock > dp_disp->max_pclk_khz))
+	if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
 		return MODE_BAD;
 
 	return dp_display_validate_mode(dp_disp, mode->clock);
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 9fa6e524832c..d861197ac1c8 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -49,7 +49,6 @@ struct dp_panel {
 	bool video_test;
 
 	u32 vic;
-	u32 max_pclk_khz;
 	u32 max_dp_lanes;
 
 	u32 max_bw_code;
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
@ 2022-03-23 10:35   ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 10:35 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno

Since the last commit, the max_pclk_khz became constant, it's set to
DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
and use DP_MAX_PIXEL_CLK_KHZ directly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/gpu/drm/msm/dp/dp_debug.c   | 2 --
 drivers/gpu/drm/msm/dp/dp_display.c | 1 -
 drivers/gpu/drm/msm/dp/dp_display.h | 2 --
 drivers/gpu/drm/msm/dp/dp_drm.c     | 4 +---
 drivers/gpu/drm/msm/dp/dp_panel.h   | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
index 2f9c943f12d5..5e35033ba3e4 100644
--- a/drivers/gpu/drm/msm/dp/dp_debug.c
+++ b/drivers/gpu/drm/msm/dp/dp_debug.c
@@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p)
 	drm_mode = &debug->panel->dp_mode.drm_mode;
 
 	seq_printf(seq, "\tname = %s\n", DEBUG_NAME);
-	seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n",
-			debug->panel->max_pclk_khz);
 	seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n",
 			debug->panel->link_info.rate);
 	seq_printf(seq, "\t\tnum_lanes = %u\n",
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index be1e9c558fda..aeb08416b309 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
 	dp->audio_supported = drm_detect_monitor_audio(edid);
 	dp_panel_handle_sink_request(dp->panel);
 
-	dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ;
 	dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes;
 
 	/*
diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 6efb5c853c89..f3a9d7449a1c 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -24,8 +24,6 @@ struct msm_dp {
 
 	hdmi_codec_plugged_cb plugged_cb;
 
-	u32 max_pclk_khz;
-
 	u32 max_dp_lanes;
 	struct dp_audio *dp_audio;
 };
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index af5f1b001192..a94c9b34f397 100644
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
 
 	dp_disp = to_dp_connector(connector)->dp_display;
 
-	if ((dp_disp->max_pclk_khz <= 0) ||
-			(dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
-			(mode->clock > dp_disp->max_pclk_khz))
+	if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
 		return MODE_BAD;
 
 	return dp_display_validate_mode(dp_disp, mode->clock);
diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 9fa6e524832c..d861197ac1c8 100644
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -49,7 +49,6 @@ struct dp_panel {
 	bool video_test;
 
 	u32 vic;
-	u32 max_pclk_khz;
 	u32 max_dp_lanes;
 
 	u32 max_bw_code;
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-23 20:46     ` Kuogee Hsieh
  -1 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:46 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> 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 | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>   3 files 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 178b774a5fbd..3dd790083cf7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
>   	ret = dp_panel_get_modes(dp_display->panel,
> -		dp->connector, dp_mode);
> +		dp->connector);
>   	if (dp_mode->drm_mode.clock)
>   		dp->max_pclk_khz = dp_mode->drm_mode.clock;
>   	return ret;
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index f1418722c549..8d7662028f30 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>   }
>   
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -	struct drm_connector *connector, struct dp_display_mode *mode)
> +	struct drm_connector *connector)
>   {
>   	if (!dp_panel) {
>   		DRM_ERROR("invalid input\n");
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9023e5bb4b8b..9fa6e524832c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>   			u32 mode_pclk_khz);
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -		struct drm_connector *connector, struct dp_display_mode *mode);
> +		struct drm_connector *connector);
>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
@ 2022-03-23 20:46     ` Kuogee Hsieh
  0 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:46 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> 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 | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>   3 files 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 178b774a5fbd..3dd790083cf7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
>   	ret = dp_panel_get_modes(dp_display->panel,
> -		dp->connector, dp_mode);
> +		dp->connector);
>   	if (dp_mode->drm_mode.clock)
>   		dp->max_pclk_khz = dp_mode->drm_mode.clock;
>   	return ret;
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index f1418722c549..8d7662028f30 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>   }
>   
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -	struct drm_connector *connector, struct dp_display_mode *mode)
> +	struct drm_connector *connector)
>   {
>   	if (!dp_panel) {
>   		DRM_ERROR("invalid input\n");
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9023e5bb4b8b..9fa6e524832c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>   			u32 mode_pclk_khz);
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -		struct drm_connector *connector, struct dp_display_mode *mode);
> +		struct drm_connector *connector);
>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-23 20:46     ` Kuogee Hsieh
  -1 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:46 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since dp_panel_get_modes() handling for dp_mode was removed,
> dp_display_get_modes also doesn't change the passed dp_mode, drop the
> unused dp_mode variable being allocated unused and then freed.
>
> 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 |  8 ++------
>   drivers/gpu/drm/msm/dp/dp_display.h |  3 +--
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 29 +----------------------------
>   3 files changed, 4 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index 3dd790083cf7..be1e9c558fda 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -999,8 +999,7 @@ int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
>   	return MODE_OK;
>   }
>   
> -int dp_display_get_modes(struct msm_dp *dp,
> -				struct dp_display_mode *dp_mode)
> +int dp_display_get_modes(struct msm_dp *dp)
>   {
>   	struct dp_display_private *dp_display;
>   	int ret = 0;
> @@ -1012,11 +1011,8 @@ int dp_display_get_modes(struct msm_dp *dp,
>   
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
> -	ret = dp_panel_get_modes(dp_display->panel,
> +	return dp_panel_get_modes(dp_display->panel,
>   		dp->connector);
> -	if (dp_mode->drm_mode.clock)
> -		dp->max_pclk_khz = dp_mode->drm_mode.clock;
> -	return ret;
>   }
>   
>   bool dp_display_check_video_test(struct msm_dp *dp)
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 7af2b186d2d9..6efb5c853c89 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -33,8 +33,7 @@ struct msm_dp {
>   int dp_display_set_plugged_cb(struct msm_dp *dp_display,
>   		hdmi_codec_plugged_cb fn, struct device *codec_dev);
>   int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
> -int dp_display_get_modes(struct msm_dp *dp_display,
> -		struct dp_display_mode *dp_mode);
> +int dp_display_get_modes(struct msm_dp *dp_display);
>   int dp_display_request_irq(struct msm_dp *dp_display);
>   bool dp_display_check_video_test(struct msm_dp *dp_display);
>   int dp_display_get_test_bpp(struct msm_dp *dp_display);
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index 80f59cf99089..af5f1b001192 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -55,49 +55,22 @@ static int dp_connector_get_modes(struct drm_connector *connector)
>   {
>   	int rc = 0;
>   	struct msm_dp *dp;
> -	struct dp_display_mode *dp_mode = NULL;
> -	struct drm_display_mode *m, drm_mode;
>   
>   	if (!connector)
>   		return 0;
>   
>   	dp = to_dp_connector(connector)->dp_display;
>   
> -	dp_mode = kzalloc(sizeof(*dp_mode),  GFP_KERNEL);
> -	if (!dp_mode)
> -		return 0;
> -
>   	/* pluggable case assumes EDID is read when HPD */
>   	if (dp->is_connected) {
> -		/*
> -		 *The get_modes() function might return one mode that is stored
> -		 * in dp_mode when compliance test is in progress. If not, the
> -		 * return value is equal to the total number of modes supported
> -		 * by the sink
> -		 */
> -		rc = dp_display_get_modes(dp, dp_mode);
> +		rc = dp_display_get_modes(dp);
>   		if (rc <= 0) {
>   			DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc);
> -			kfree(dp_mode);
>   			return rc;
>   		}
> -		if (dp_mode->drm_mode.clock) { /* valid DP mode */
> -			memset(&drm_mode, 0x0, sizeof(drm_mode));
> -			drm_mode_copy(&drm_mode, &dp_mode->drm_mode);
> -			m = drm_mode_duplicate(connector->dev, &drm_mode);
> -			if (!m) {
> -				DRM_ERROR("failed to add mode %ux%u\n",
> -				       drm_mode.hdisplay,
> -				       drm_mode.vdisplay);
> -				kfree(dp_mode);
> -				return 0;
> -			}
> -			drm_mode_probed_add(connector, m);
> -		}
>   	} else {
>   		DRM_DEBUG_DP("No sink connected\n");
>   	}
> -	kfree(dp_mode);
>   	return rc;
>   }
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-23 20:46     ` Kuogee Hsieh
  0 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:46 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since dp_panel_get_modes() handling for dp_mode was removed,
> dp_display_get_modes also doesn't change the passed dp_mode, drop the
> unused dp_mode variable being allocated unused and then freed.
>
> 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 |  8 ++------
>   drivers/gpu/drm/msm/dp/dp_display.h |  3 +--
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 29 +----------------------------
>   3 files changed, 4 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index 3dd790083cf7..be1e9c558fda 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -999,8 +999,7 @@ int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
>   	return MODE_OK;
>   }
>   
> -int dp_display_get_modes(struct msm_dp *dp,
> -				struct dp_display_mode *dp_mode)
> +int dp_display_get_modes(struct msm_dp *dp)
>   {
>   	struct dp_display_private *dp_display;
>   	int ret = 0;
> @@ -1012,11 +1011,8 @@ int dp_display_get_modes(struct msm_dp *dp,
>   
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
> -	ret = dp_panel_get_modes(dp_display->panel,
> +	return dp_panel_get_modes(dp_display->panel,
>   		dp->connector);
> -	if (dp_mode->drm_mode.clock)
> -		dp->max_pclk_khz = dp_mode->drm_mode.clock;
> -	return ret;
>   }
>   
>   bool dp_display_check_video_test(struct msm_dp *dp)
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 7af2b186d2d9..6efb5c853c89 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -33,8 +33,7 @@ struct msm_dp {
>   int dp_display_set_plugged_cb(struct msm_dp *dp_display,
>   		hdmi_codec_plugged_cb fn, struct device *codec_dev);
>   int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
> -int dp_display_get_modes(struct msm_dp *dp_display,
> -		struct dp_display_mode *dp_mode);
> +int dp_display_get_modes(struct msm_dp *dp_display);
>   int dp_display_request_irq(struct msm_dp *dp_display);
>   bool dp_display_check_video_test(struct msm_dp *dp_display);
>   int dp_display_get_test_bpp(struct msm_dp *dp_display);
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index 80f59cf99089..af5f1b001192 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -55,49 +55,22 @@ static int dp_connector_get_modes(struct drm_connector *connector)
>   {
>   	int rc = 0;
>   	struct msm_dp *dp;
> -	struct dp_display_mode *dp_mode = NULL;
> -	struct drm_display_mode *m, drm_mode;
>   
>   	if (!connector)
>   		return 0;
>   
>   	dp = to_dp_connector(connector)->dp_display;
>   
> -	dp_mode = kzalloc(sizeof(*dp_mode),  GFP_KERNEL);
> -	if (!dp_mode)
> -		return 0;
> -
>   	/* pluggable case assumes EDID is read when HPD */
>   	if (dp->is_connected) {
> -		/*
> -		 *The get_modes() function might return one mode that is stored
> -		 * in dp_mode when compliance test is in progress. If not, the
> -		 * return value is equal to the total number of modes supported
> -		 * by the sink
> -		 */
> -		rc = dp_display_get_modes(dp, dp_mode);
> +		rc = dp_display_get_modes(dp);
>   		if (rc <= 0) {
>   			DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc);
> -			kfree(dp_mode);
>   			return rc;
>   		}
> -		if (dp_mode->drm_mode.clock) { /* valid DP mode */
> -			memset(&drm_mode, 0x0, sizeof(drm_mode));
> -			drm_mode_copy(&drm_mode, &dp_mode->drm_mode);
> -			m = drm_mode_duplicate(connector->dev, &drm_mode);
> -			if (!m) {
> -				DRM_ERROR("failed to add mode %ux%u\n",
> -				       drm_mode.hdisplay,
> -				       drm_mode.vdisplay);
> -				kfree(dp_mode);
> -				return 0;
> -			}
> -			drm_mode_probed_add(connector, m);
> -		}
>   	} else {
>   		DRM_DEBUG_DP("No sink connected\n");
>   	}
> -	kfree(dp_mode);
>   	return rc;
>   }
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-23 20:47     ` Kuogee Hsieh
  -1 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:47 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the last commit, the max_pclk_khz became constant, it's set to
> DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
> and use DP_MAX_PIXEL_CLK_KHZ directly.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
>   drivers/gpu/drm/msm/dp/dp_debug.c   | 2 --
>   drivers/gpu/drm/msm/dp/dp_display.c | 1 -
>   drivers/gpu/drm/msm/dp/dp_display.h | 2 --
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 4 +---
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 1 -
>   5 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
> index 2f9c943f12d5..5e35033ba3e4 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.c
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.c
> @@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p)
>   	drm_mode = &debug->panel->dp_mode.drm_mode;
>   
>   	seq_printf(seq, "\tname = %s\n", DEBUG_NAME);
> -	seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n",
> -			debug->panel->max_pclk_khz);
>   	seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n",
>   			debug->panel->link_info.rate);
>   	seq_printf(seq, "\t\tnum_lanes = %u\n",
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index be1e9c558fda..aeb08416b309 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
>   	dp->audio_supported = drm_detect_monitor_audio(edid);
>   	dp_panel_handle_sink_request(dp->panel);
>   
> -	dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ;
>   	dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes;
>   
>   	/*
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 6efb5c853c89..f3a9d7449a1c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -24,8 +24,6 @@ struct msm_dp {
>   
>   	hdmi_codec_plugged_cb plugged_cb;
>   
> -	u32 max_pclk_khz;
> -
>   	u32 max_dp_lanes;
>   	struct dp_audio *dp_audio;
>   };
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index af5f1b001192..a94c9b34f397 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
>   
>   	dp_disp = to_dp_connector(connector)->dp_display;
>   
> -	if ((dp_disp->max_pclk_khz <= 0) ||
> -			(dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
> -			(mode->clock > dp_disp->max_pclk_khz))
> +	if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
>   		return MODE_BAD;
>   
>   	return dp_display_validate_mode(dp_disp, mode->clock);
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9fa6e524832c..d861197ac1c8 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -49,7 +49,6 @@ struct dp_panel {
>   	bool video_test;
>   
>   	u32 vic;
> -	u32 max_pclk_khz;
>   	u32 max_dp_lanes;
>   
>   	u32 max_bw_code;

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
@ 2022-03-23 20:47     ` Kuogee Hsieh
  0 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 20:47 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the last commit, the max_pclk_khz became constant, it's set to
> DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
> and use DP_MAX_PIXEL_CLK_KHZ directly.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
>   drivers/gpu/drm/msm/dp/dp_debug.c   | 2 --
>   drivers/gpu/drm/msm/dp/dp_display.c | 1 -
>   drivers/gpu/drm/msm/dp/dp_display.h | 2 --
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 4 +---
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 1 -
>   5 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c
> index 2f9c943f12d5..5e35033ba3e4 100644
> --- a/drivers/gpu/drm/msm/dp/dp_debug.c
> +++ b/drivers/gpu/drm/msm/dp/dp_debug.c
> @@ -44,8 +44,6 @@ static int dp_debug_show(struct seq_file *seq, void *p)
>   	drm_mode = &debug->panel->dp_mode.drm_mode;
>   
>   	seq_printf(seq, "\tname = %s\n", DEBUG_NAME);
> -	seq_printf(seq, "\tdp_panel\n\t\tmax_pclk_khz = %d\n",
> -			debug->panel->max_pclk_khz);
>   	seq_printf(seq, "\tdrm_dp_link\n\t\trate = %u\n",
>   			debug->panel->link_info.rate);
>   	seq_printf(seq, "\t\tnum_lanes = %u\n",
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index be1e9c558fda..aeb08416b309 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -370,7 +370,6 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
>   	dp->audio_supported = drm_detect_monitor_audio(edid);
>   	dp_panel_handle_sink_request(dp->panel);
>   
> -	dp->dp_display.max_pclk_khz = DP_MAX_PIXEL_CLK_KHZ;
>   	dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes;
>   
>   	/*
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 6efb5c853c89..f3a9d7449a1c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -24,8 +24,6 @@ struct msm_dp {
>   
>   	hdmi_codec_plugged_cb plugged_cb;
>   
> -	u32 max_pclk_khz;
> -
>   	u32 max_dp_lanes;
>   	struct dp_audio *dp_audio;
>   };
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index af5f1b001192..a94c9b34f397 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
>   
>   	dp_disp = to_dp_connector(connector)->dp_display;
>   
> -	if ((dp_disp->max_pclk_khz <= 0) ||
> -			(dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
> -			(mode->clock > dp_disp->max_pclk_khz))
> +	if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
>   		return MODE_BAD;
>   
>   	return dp_display_validate_mode(dp_disp, mode->clock);
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9fa6e524832c..d861197ac1c8 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -49,7 +49,6 @@ struct dp_panel {
>   	bool video_test;
>   
>   	u32 vic;
> -	u32 max_pclk_khz;
>   	u32 max_dp_lanes;
>   
>   	u32 max_bw_code;

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  2022-03-23 20:46     ` Kuogee Hsieh
@ 2022-03-23 20:47       ` Dmitry Baryshkov
  -1 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 20:47 UTC (permalink / raw)
  To: Kuogee Hsieh, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä

On 23/03/2022 23:46, Kuogee Hsieh wrote:
> 
> On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
>> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
>> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
>> the dp_mode argument. Drop it completely.
>>
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>

There was an extra >, so this line wasn't picked up by patchwork.

> 
>> ---
>>   drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
>>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>>   3 files 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 178b774a5fbd..3dd790083cf7 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_display.c
>> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
>> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>>       dp_display = container_of(dp, struct dp_display_private, 
>> dp_display);
>>       ret = dp_panel_get_modes(dp_display->panel,
>> -        dp->connector, dp_mode);
>> +        dp->connector);
>>       if (dp_mode->drm_mode.clock)
>>           dp->max_pclk_khz = dp_mode->drm_mode.clock;
>>       return ret;
>> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c 
>> b/drivers/gpu/drm/msm/dp/dp_panel.c
>> index f1418722c549..8d7662028f30 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
>> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
>> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>>   }
>>   int dp_panel_get_modes(struct dp_panel *dp_panel,
>> -    struct drm_connector *connector, struct dp_display_mode *mode)
>> +    struct drm_connector *connector)
>>   {
>>       if (!dp_panel) {
>>           DRM_ERROR("invalid input\n");
>> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h 
>> b/drivers/gpu/drm/msm/dp/dp_panel.h
>> index 9023e5bb4b8b..9fa6e524832c 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
>> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
>> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>>               u32 mode_pclk_khz);
>>   int dp_panel_get_modes(struct dp_panel *dp_panel,
>> -        struct drm_connector *connector, struct dp_display_mode *mode);
>> +        struct drm_connector *connector);
>>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);


-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
@ 2022-03-23 20:47       ` Dmitry Baryshkov
  0 siblings, 0 replies; 26+ messages in thread
From: Dmitry Baryshkov @ 2022-03-23 20:47 UTC (permalink / raw)
  To: Kuogee Hsieh, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno

On 23/03/2022 23:46, Kuogee Hsieh wrote:
> 
> On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
>> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
>> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
>> the dp_mode argument. Drop it completely.
>>
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>

There was an extra >, so this line wasn't picked up by patchwork.

> 
>> ---
>>   drivers/gpu/drm/msm/dp/dp_display.c | 2 +-
>>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>>   3 files 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 178b774a5fbd..3dd790083cf7 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_display.c
>> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
>> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>>       dp_display = container_of(dp, struct dp_display_private, 
>> dp_display);
>>       ret = dp_panel_get_modes(dp_display->panel,
>> -        dp->connector, dp_mode);
>> +        dp->connector);
>>       if (dp_mode->drm_mode.clock)
>>           dp->max_pclk_khz = dp_mode->drm_mode.clock;
>>       return ret;
>> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c 
>> b/drivers/gpu/drm/msm/dp/dp_panel.c
>> index f1418722c549..8d7662028f30 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
>> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
>> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>>   }
>>   int dp_panel_get_modes(struct dp_panel *dp_panel,
>> -    struct drm_connector *connector, struct dp_display_mode *mode)
>> +    struct drm_connector *connector)
>>   {
>>       if (!dp_panel) {
>>           DRM_ERROR("invalid input\n");
>> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h 
>> b/drivers/gpu/drm/msm/dp/dp_panel.h
>> index 9023e5bb4b8b..9fa6e524832c 100644
>> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
>> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
>> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>>               u32 mode_pclk_khz);
>>   int dp_panel_get_modes(struct dp_panel *dp_panel,
>> -        struct drm_connector *connector, struct dp_display_mode *mode);
>> +        struct drm_connector *connector);
>>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);


-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes()
  2022-03-23 10:35 ` Dmitry Baryshkov
@ 2022-03-23 20:48   ` Abhinav Kumar
  -1 siblings, 0 replies; 26+ messages in thread
From: Abhinav Kumar @ 2022-03-23 20:48 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno



On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> As noted by Ville Syrjälä [1] the dp_connector_get_modes() has weird
> on-stack interim copy of the mode. When reviewing the mentioned patch I
> noticed that the rest of the code in dp_connector_get_modes() is weird,
> unused since September of 2020 and can be removed. This series removes
> dead weird code leaving dp_connector_get_modes() simple enough.
> 
> [1] https://lore.kernel.org/linux-arm-msm/20220218100403.7028-11-ville.syrjala@linux.intel.com/
For the series,
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> 
> *** BLURB HERE ***
> 
> Dmitry Baryshkov (3):
>    drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
>    drm/msm/dp: simplify dp_connector_get_modes()
>    drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
> 
>   drivers/gpu/drm/msm/dp/dp_debug.c   |  2 --
>   drivers/gpu/drm/msm/dp/dp_display.c | 11 +++-------
>   drivers/gpu/drm/msm/dp/dp_display.h |  5 +----
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 33 ++---------------------------
>   drivers/gpu/drm/msm/dp/dp_panel.c   |  2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   |  3 +--
>   6 files changed, 8 insertions(+), 48 deletions(-)
> 

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-23 20:48   ` Abhinav Kumar
  0 siblings, 0 replies; 26+ messages in thread
From: Abhinav Kumar @ 2022-03-23 20:48 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Kuogee Hsieh, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, freedreno, dri-devel, Stephen Boyd



On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> As noted by Ville Syrjälä [1] the dp_connector_get_modes() has weird
> on-stack interim copy of the mode. When reviewing the mentioned patch I
> noticed that the rest of the code in dp_connector_get_modes() is weird,
> unused since September of 2020 and can be removed. This series removes
> dead weird code leaving dp_connector_get_modes() simple enough.
> 
> [1] https://lore.kernel.org/linux-arm-msm/20220218100403.7028-11-ville.syrjala@linux.intel.com/
For the series,
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> 
> *** BLURB HERE ***
> 
> Dmitry Baryshkov (3):
>    drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
>    drm/msm/dp: simplify dp_connector_get_modes()
>    drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
> 
>   drivers/gpu/drm/msm/dp/dp_debug.c   |  2 --
>   drivers/gpu/drm/msm/dp/dp_display.c | 11 +++-------
>   drivers/gpu/drm/msm/dp/dp_display.h |  5 +----
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 33 ++---------------------------
>   drivers/gpu/drm/msm/dp/dp_panel.c   |  2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   |  3 +--
>   6 files changed, 8 insertions(+), 48 deletions(-)
> 

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-23 21:02     ` Kuogee Hsieh
  -1 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 21:02 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm,
	dri-devel, freedreno, Ville Syrjälä


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> 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 | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>   3 files 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 178b774a5fbd..3dd790083cf7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
>   	ret = dp_panel_get_modes(dp_display->panel,
> -		dp->connector, dp_mode);
> +		dp->connector);
>   	if (dp_mode->drm_mode.clock)
>   		dp->max_pclk_khz = dp_mode->drm_mode.clock;
>   	return ret;
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index f1418722c549..8d7662028f30 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>   }
>   
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -	struct drm_connector *connector, struct dp_display_mode *mode)
> +	struct drm_connector *connector)
>   {
>   	if (!dp_panel) {
>   		DRM_ERROR("invalid input\n");
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9023e5bb4b8b..9fa6e524832c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>   			u32 mode_pclk_khz);
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -		struct drm_connector *connector, struct dp_display_mode *mode);
> +		struct drm_connector *connector);
>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
@ 2022-03-23 21:02     ` Kuogee Hsieh
  0 siblings, 0 replies; 26+ messages in thread
From: Kuogee Hsieh @ 2022-03-23 21:02 UTC (permalink / raw)
  To: Dmitry Baryshkov, Bjorn Andersson, Rob Clark, Sean Paul,
	Abhinav Kumar, Sankeerth Billakanti
  Cc: David Airlie, linux-arm-msm, dri-devel, Stephen Boyd, freedreno


On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> 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 | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.c   | 2 +-
>   drivers/gpu/drm/msm/dp/dp_panel.h   | 2 +-
>   3 files 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 178b774a5fbd..3dd790083cf7 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -1013,7 +1013,7 @@ int dp_display_get_modes(struct msm_dp *dp,
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
>   	ret = dp_panel_get_modes(dp_display->panel,
> -		dp->connector, dp_mode);
> +		dp->connector);
>   	if (dp_mode->drm_mode.clock)
>   		dp->max_pclk_khz = dp_mode->drm_mode.clock;
>   	return ret;
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
> index f1418722c549..8d7662028f30 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.c
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.c
> @@ -259,7 +259,7 @@ u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel,
>   }
>   
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -	struct drm_connector *connector, struct dp_display_mode *mode)
> +	struct drm_connector *connector)
>   {
>   	if (!dp_panel) {
>   		DRM_ERROR("invalid input\n");
> diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
> index 9023e5bb4b8b..9fa6e524832c 100644
> --- a/drivers/gpu/drm/msm/dp/dp_panel.h
> +++ b/drivers/gpu/drm/msm/dp/dp_panel.h
> @@ -64,7 +64,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
>   u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,
>   			u32 mode_pclk_khz);
>   int dp_panel_get_modes(struct dp_panel *dp_panel,
> -		struct drm_connector *connector, struct dp_display_mode *mode);
> +		struct drm_connector *connector);
>   void dp_panel_handle_sink_request(struct dp_panel *dp_panel);
>   void dp_panel_tpg_config(struct dp_panel *dp_panel, bool enable);
>   

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-24 20:07     ` Stephen Boyd
  -1 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:07 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno,
	Ville Syrjälä

Quoting Dmitry Baryshkov (2022-03-23 03:35:44)
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes()
@ 2022-03-24 20:07     ` Stephen Boyd
  0 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:07 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, linux-arm-msm, dri-devel, freedreno

Quoting Dmitry Baryshkov (2022-03-23 03:35:44)
> Since the commit ab205927592b ("drm/msm/dp: remove mode hard-coding in
> case of DP CTS") the function dp_panel_get_modes() doesn't use (or fill)
> the dp_mode argument. Drop it completely.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-24 20:10     ` Stephen Boyd
  -1 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:10 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno,
	Ville Syrjälä

Quoting Dmitry Baryshkov (2022-03-23 03:35:46)
> Since the last commit, the max_pclk_khz became constant, it's set to
> DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
> and use DP_MAX_PIXEL_CLK_KHZ directly.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index af5f1b001192..a94c9b34f397 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
>
>         dp_disp = to_dp_connector(connector)->dp_display;
>
> -       if ((dp_disp->max_pclk_khz <= 0) ||
> -                       (dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
> -                       (mode->clock > dp_disp->max_pclk_khz))
> +       if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
>                 return MODE_BAD;

Can we have a followup patch to return MODE_CLOCK_HIGH?

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display
@ 2022-03-24 20:10     ` Stephen Boyd
  0 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:10 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, linux-arm-msm, dri-devel, freedreno

Quoting Dmitry Baryshkov (2022-03-23 03:35:46)
> Since the last commit, the max_pclk_khz became constant, it's set to
> DP_MAX_PIXEL_CLK_KHZ and never changed afterwards. Remove it completely
> and use DP_MAX_PIXEL_CLK_KHZ directly.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index af5f1b001192..a94c9b34f397 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -88,9 +88,7 @@ static enum drm_mode_status dp_connector_mode_valid(
>
>         dp_disp = to_dp_connector(connector)->dp_display;
>
> -       if ((dp_disp->max_pclk_khz <= 0) ||
> -                       (dp_disp->max_pclk_khz > DP_MAX_PIXEL_CLK_KHZ) ||
> -                       (mode->clock > dp_disp->max_pclk_khz))
> +       if (mode->clock > DP_MAX_PIXEL_CLK_KHZ)
>                 return MODE_BAD;

Can we have a followup patch to return MODE_CLOCK_HIGH?

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
  2022-03-23 10:35   ` Dmitry Baryshkov
@ 2022-03-24 20:11     ` Stephen Boyd
  -1 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:11 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno,
	Ville Syrjälä

Quoting Dmitry Baryshkov (2022-03-23 03:35:45)
> Since dp_panel_get_modes() handling for dp_mode was removed,
> dp_display_get_modes also doesn't change the passed dp_mode, drop the
> unused dp_mode variable being allocated unused and then freed.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()
@ 2022-03-24 20:11     ` Stephen Boyd
  0 siblings, 0 replies; 26+ messages in thread
From: Stephen Boyd @ 2022-03-24 20:11 UTC (permalink / raw)
  To: Abhinav Kumar, Bjorn Andersson, Dmitry Baryshkov, Kuogee Hsieh,
	Rob Clark, Sankeerth Billakanti, Sean Paul
  Cc: David Airlie, linux-arm-msm, dri-devel, freedreno

Quoting Dmitry Baryshkov (2022-03-23 03:35:45)
> Since dp_panel_get_modes() handling for dp_mode was removed,
> dp_display_get_modes also doesn't change the passed dp_mode, drop the
> unused dp_mode variable being allocated unused and then freed.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

^ permalink raw reply	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2022-03-24 20:11 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-23 10:35 [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes() Dmitry Baryshkov
2022-03-23 10:35 ` Dmitry Baryshkov
2022-03-23 10:35 ` [PATCH 1/3] drm/msm/dp: drop dp_mode argument from dp_panel_get_modes() Dmitry Baryshkov
2022-03-23 10:35   ` Dmitry Baryshkov
2022-03-23 20:46   ` Kuogee Hsieh
2022-03-23 20:46     ` Kuogee Hsieh
2022-03-23 20:47     ` Dmitry Baryshkov
2022-03-23 20:47       ` Dmitry Baryshkov
2022-03-23 21:02   ` Kuogee Hsieh
2022-03-23 21:02     ` Kuogee Hsieh
2022-03-24 20:07   ` Stephen Boyd
2022-03-24 20:07     ` Stephen Boyd
2022-03-23 10:35 ` [PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes() Dmitry Baryshkov
2022-03-23 10:35   ` Dmitry Baryshkov
2022-03-23 20:46   ` Kuogee Hsieh
2022-03-23 20:46     ` Kuogee Hsieh
2022-03-24 20:11   ` Stephen Boyd
2022-03-24 20:11     ` Stephen Boyd
2022-03-23 10:35 ` [PATCH 3/3] drm/msm/dp: remove max_pclk_khz field from dp_panel/dp_display Dmitry Baryshkov
2022-03-23 10:35   ` Dmitry Baryshkov
2022-03-23 20:47   ` Kuogee Hsieh
2022-03-23 20:47     ` Kuogee Hsieh
2022-03-24 20:10   ` Stephen Boyd
2022-03-24 20:10     ` Stephen Boyd
2022-03-23 20:48 ` [PATCH 0/3] drm/msm/dp: simplify dp_connector_get_modes() Abhinav Kumar
2022-03-23 20:48   ` Abhinav Kumar

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.