All of lore.kernel.org
 help / color / mirror / Atom feed
* Various cleanups for amdgpu_dm
@ 2017-10-17 16:18 Tom St Denis
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:18 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Various cleanups to indentation/braces as well as a couple of
simplifications.  Mostly NFC but there are a couple of patches with
trivial functional changes (#6, #8) 

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 01/13] drm/amd/display: Simplify dm_late_init()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 02/13] drm/amd/display: Fix indentation in dm_suspend() Tom St Denis
                     ` (13 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 63ddf78e7482..8b90766c0fe8 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -538,9 +538,8 @@ static int detect_mst_link_for_all_connectors(struct drm_device *dev)
 static int dm_late_init(void *handle)
 {
 	struct drm_device *dev = ((struct amdgpu_device *)handle)->ddev;
-	int r = detect_mst_link_for_all_connectors(dev);
 
-	return r;
+	return detect_mst_link_for_all_connectors(dev);
 }
 
 static void s3_handle_mst(struct drm_device *dev, bool suspend)
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 02/13] drm/amd/display: Fix indentation in dm_suspend()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  2017-10-17 16:19   ` [PATCH 01/13] drm/amd/display: Simplify dm_late_init() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 03/13] drm/amd/display: Fix indentation in dm_resume() Tom St Denis
                     ` (12 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 8b90766c0fe8..708372001456 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -598,10 +598,7 @@ static int dm_suspend(void *handle)
 	WARN_ON(adev->dm.cached_state);
 	adev->dm.cached_state = drm_atomic_helper_suspend(adev->ddev);
 
-	dc_set_power_state(
-		dm->dc,
-		DC_ACPI_CM_POWER_STATE_D3
-		);
+	dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D3);
 
 	return ret;
 }
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 03/13] drm/amd/display: Fix indentation in dm_resume()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  2017-10-17 16:19   ` [PATCH 01/13] drm/amd/display: Simplify dm_late_init() Tom St Denis
  2017-10-17 16:19   ` [PATCH 02/13] drm/amd/display: Fix indentation in dm_suspend() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 04/13] drm/amd/display: Fix brace style in amdgpu_dm_update_connector_after_detect() Tom St Denis
                     ` (11 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 708372001456..0e10548dfd1f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -636,10 +636,7 @@ static int dm_resume(void *handle)
 	struct amdgpu_display_manager *dm = &adev->dm;
 
 	/* power on hardware */
-	dc_set_power_state(
-		dm->dc,
-		DC_ACPI_CM_POWER_STATE_D0
-		);
+	dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0);
 
 	return 0;
 }
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 04/13] drm/amd/display: Fix brace style in amdgpu_dm_update_connector_after_detect()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (2 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 03/13] drm/amd/display: Fix indentation in dm_resume() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 05/13] drm/amd/display: Fix brace style in dm_handle_hpd_rx_irq() Tom St Denis
                     ` (10 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 0e10548dfd1f..3a927a24ea0c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -898,9 +898,9 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
 							connector);
 
 		aconnector->dc_sink = sink;
-		if (sink->dc_edid.length == 0)
+		if (sink->dc_edid.length == 0) {
 			aconnector->edid = NULL;
-		else {
+		} else {
 			aconnector->edid =
 				(struct edid *) sink->dc_edid.raw_edid;
 
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 05/13] drm/amd/display: Fix brace style in dm_handle_hpd_rx_irq()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (3 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 04/13] drm/amd/display: Fix brace style in amdgpu_dm_update_connector_after_detect() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 06/13] drm/amd/display: Simplify handle_hpd_rx_irq() Tom St Denis
                     ` (9 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 3a927a24ea0c..f999cb312fa3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1018,8 +1018,9 @@ static void dm_handle_hpd_rx_irq(struct amdgpu_dm_connector *aconnector)
 				dpcd_bytes_to_read);
 
 			new_irq_handled = false;
-		} else
+		} else {
 			break;
+		}
 	}
 
 	if (process_count == max_process_count)
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 06/13] drm/amd/display: Simplify handle_hpd_rx_irq()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (4 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 05/13] drm/amd/display: Fix brace style in dm_handle_hpd_rx_irq() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 07/13] drm/amd/display: Fix brace style in amdgpu_dm_initialize_drm_device() Tom St Denis
                     ` (8 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

There is a local reference to the dc_link that wasn't being
used so we shorten references throughout the function.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f999cb312fa3..f2d21dccc647 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1032,20 +1032,20 @@ static void handle_hpd_rx_irq(void *param)
 	struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;
 	struct drm_connector *connector = &aconnector->base;
 	struct drm_device *dev = connector->dev;
-	const struct dc_link *dc_link = aconnector->dc_link;
+	struct dc_link *dc_link = aconnector->dc_link;
 	bool is_mst_root_connector = aconnector->mst_mgr.mst_state;
 
 	/* TODO:Temporary add mutex to protect hpd interrupt not have a gpio
 	 * conflict, after implement i2c helper, this mutex should be
 	 * retired.
 	 */
-	if (aconnector->dc_link->type != dc_connection_mst_branch)
+	if (dc_link->type != dc_connection_mst_branch)
 		mutex_lock(&aconnector->hpd_lock);
 
-	if (dc_link_handle_hpd_rx_irq(aconnector->dc_link, NULL) &&
+	if (dc_link_handle_hpd_rx_irq(dc_link, NULL) &&
 			!is_mst_root_connector) {
 		/* Downstream Port status changed. */
-		if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPDRX)) {
+		if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {
 			amdgpu_dm_update_connector_after_detect(aconnector);
 
 
@@ -1057,10 +1057,10 @@ static void handle_hpd_rx_irq(void *param)
 		}
 	}
 	if ((dc_link->cur_link_settings.lane_count != LANE_COUNT_UNKNOWN) ||
-				(dc_link->type == dc_connection_mst_branch))
+	    (dc_link->type == dc_connection_mst_branch))
 		dm_handle_hpd_rx_irq(aconnector);
 
-	if (aconnector->dc_link->type != dc_connection_mst_branch)
+	if (dc_link->type != dc_connection_mst_branch)
 		mutex_unlock(&aconnector->hpd_lock);
 }
 
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 07/13] drm/amd/display: Fix brace style in amdgpu_dm_initialize_drm_device()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (5 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 06/13] drm/amd/display: Simplify handle_hpd_rx_irq() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 08/13] drm/amd/display: Replace block with strncpy() in fill_audio_info() Tom St Denis
                     ` (7 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f2d21dccc647..e371d740b662 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1420,9 +1420,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
 			goto fail_free_planes;
 
 		aencoder = kzalloc(sizeof(*aencoder), GFP_KERNEL);
-		if (!aencoder) {
+		if (!aencoder)
 			goto fail_free_connector;
-		}
 
 		if (amdgpu_dm_encoder_init(dm->ddev, aencoder, i)) {
 			DRM_ERROR("KMS: Failed to initialize encoder\n");
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 08/13] drm/amd/display: Replace block with strncpy() in fill_audio_info()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (6 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 07/13] drm/amd/display: Fix brace style in amdgpu_dm_initialize_drm_device() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 09/13] drm/amd/display: Fix indentation in create_eml_sink() Tom St Denis
                     ` (6 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Replace inlined strncpy with library call.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index e371d740b662..c23e6a288666 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2251,11 +2251,9 @@ static void fill_audio_info(struct audio_info *audio_info,
 
 	cea_revision = drm_connector->display_info.cea_rev;
 
-	while (i < AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS &&
-		edid_caps->display_name[i]) {
-		audio_info->display_name[i] = edid_caps->display_name[i];
-		i++;
-	}
+	strncpy(audio_info->display_name,
+		edid_caps->display_name,
+		AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS - 1);
 
 	if (cea_revision >= 3) {
 		audio_info->mode_count = edid_caps->audio_mode_count;
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 09/13] drm/amd/display: Fix indentation in create_eml_sink()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (7 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 08/13] drm/amd/display: Replace block with strncpy() in fill_audio_info() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 10/13] drm/amd/display: Tidy up dm_drm_plane_reset() Tom St Denis
                     ` (5 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index c23e6a288666..5e03d918b19f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2816,8 +2816,7 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector)
 		(edid->extensions + 1) * EDID_LENGTH,
 		&init_params);
 
-	if (aconnector->base.force
-					== DRM_FORCE_ON)
+	if (aconnector->base.force == DRM_FORCE_ON)
 		aconnector->dc_sink = aconnector->dc_link->local_sink ?
 		aconnector->dc_link->local_sink :
 		aconnector->dc_em_sink;
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 10/13] drm/amd/display: Tidy up dm_drm_plane_reset()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (8 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 09/13] drm/amd/display: Fix indentation in create_eml_sink() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 11/13] drm/amd/display: Fix brace style in amdgpu_dm_connector_ddc_get_modes() Tom St Denis
                     ` (4 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Move WARN_ON higher up and in doing so fix brace style.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 5e03d918b19f..b4454937b4d4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2969,13 +2969,13 @@ static void dm_drm_plane_reset(struct drm_plane *plane)
 		plane->funcs->atomic_destroy_state(plane, plane->state);
 
 	amdgpu_state = kzalloc(sizeof(*amdgpu_state), GFP_KERNEL);
-
+	WARN_ON(amdgpu_state == NULL);
+	
 	if (amdgpu_state) {
 		plane->state = &amdgpu_state->base;
 		plane->state->plane = plane;
 		plane->state->rotation = DRM_MODE_ROTATE_0;
-	} else
-		WARN_ON(1);
+	}
 }
 
 static struct drm_plane_state *
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 11/13] drm/amd/display: Fix brace style in amdgpu_dm_connector_ddc_get_modes()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (9 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 10/13] drm/amd/display: Tidy up dm_drm_plane_reset() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 12/13] drm/amd/display: Remove needless cast in amdgpu_dm_connector_init() Tom St Denis
                     ` (3 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index b4454937b4d4..89479eb99d1e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3409,8 +3409,9 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
 		drm_edid_to_eld(connector, edid);
 
 		amdgpu_dm_get_native_mode(connector);
-	} else
+	} else {
 		amdgpu_dm_connector->num_modes = 0;
+	}
 }
 
 static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 12/13] drm/amd/display: Remove needless cast in amdgpu_dm_connector_init()
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (10 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 11/13] drm/amd/display: Fix brace style in amdgpu_dm_connector_ddc_get_modes() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 16:19   ` [PATCH 13/13] drm/amd/display: Fix brace style Tom St Denis
                     ` (2 subsequent siblings)
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

The cast of dc_link is redundant.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 89479eb99d1e..58e29a2a5ca6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3567,7 +3567,8 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
 	struct dc *dc = dm->dc;
 	struct dc_link *link = dc_get_link_at_index(dc, link_index);
 	struct amdgpu_i2c_adapter *i2c;
-	((struct dc_link *)link)->priv = aconnector;
+
+	link->priv = aconnector;
 
 	DRM_DEBUG_DRIVER("%s()\n", __func__);
 
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* [PATCH 13/13] drm/amd/display: Fix brace style
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (11 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 12/13] drm/amd/display: Remove needless cast in amdgpu_dm_connector_init() Tom St Denis
@ 2017-10-17 16:19   ` Tom St Denis
  2017-10-17 17:16   ` Various cleanups for amdgpu_dm Andrey Grodzovsky
  2017-10-17 20:30   ` Harry Wentland
  14 siblings, 0 replies; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 16:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index b9e4d3831001..ca5d0d1581dc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -208,24 +208,21 @@ static void remove_timer_handler(struct amdgpu_device *adev,
 			DM_IRQ_TABLE_LOCK(adev, irq_table_flags);
 		}
 
-		if (handler_in == NULL) {
-			/* Remove ALL handlers. */
+		/* Remove ALL handlers. */
+		if (handler_in == NULL)
 			continue;
-		}
 
-		if (handler_in == handler_temp) {
-			/* Remove a SPECIFIC handler.
-			 * Found our handler - we can stop here. */
+		/* Remove a SPECIFIC handler.
+		 * Found our handler - we can stop here. */
+		if (handler_in == handler_temp)
 			break;
-		}
 	}
 
 	DM_IRQ_TABLE_UNLOCK(adev, irq_table_flags);
 
-	if (handler_in != NULL && handler_removed == false) {
+	if (handler_in != NULL && handler_removed == false)
 		DRM_ERROR("DM_IRQ: handler: %p is not in the list!\n",
 				handler_in);
-	}
 }
 
 static bool
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* Re: Various cleanups for amdgpu_dm
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (12 preceding siblings ...)
  2017-10-17 16:19   ` [PATCH 13/13] drm/amd/display: Fix brace style Tom St Denis
@ 2017-10-17 17:16   ` Andrey Grodzovsky
  2017-10-17 20:30   ` Harry Wentland
  14 siblings, 0 replies; 18+ messages in thread
From: Andrey Grodzovsky @ 2017-10-17 17:16 UTC (permalink / raw)
  To: Tom St Denis, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Acked-by: Andrey Grodzovsky  <andey.grodzovsky@amd.com>


On 10/17/2017 12:18 PM, Tom St Denis wrote:
> Various cleanups to indentation/braces as well as a couple of
> simplifications.  Mostly NFC but there are a couple of patches with
> trivial functional changes (#6, #8)
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* Re: Various cleanups for amdgpu_dm
       [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
                     ` (13 preceding siblings ...)
  2017-10-17 17:16   ` Various cleanups for amdgpu_dm Andrey Grodzovsky
@ 2017-10-17 20:30   ` Harry Wentland
       [not found]     ` <5eaea6a7-e3d9-e19d-4d75-3d26e4db9aaf-5C7GfCeVMHo@public.gmane.org>
  14 siblings, 1 reply; 18+ messages in thread
From: Harry Wentland @ 2017-10-17 20:30 UTC (permalink / raw)
  To: Tom St Denis, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Thanks for these cleanups.

Some of these could possibly squashed but then, I generally
prefer smaller changes than one big lump.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

On 2017-10-17 12:18 PM, Tom St Denis wrote:
> Various cleanups to indentation/braces as well as a couple of
> simplifications.  Mostly NFC but there are a couple of patches with
> trivial functional changes (#6, #8) 
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> 
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* Re: Various cleanups for amdgpu_dm
       [not found]     ` <5eaea6a7-e3d9-e19d-4d75-3d26e4db9aaf-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-17 21:43       ` Tom St Denis
       [not found]         ` <6dadea86-5a2c-e193-d02f-27515408b24c-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 18+ messages in thread
From: Tom St Denis @ 2017-10-17 21:43 UTC (permalink / raw)
  To: Harry Wentland, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On 17/10/17 04:30 PM, Harry Wentland wrote:
> Thanks for these cleanups.
> 
> Some of these could possibly squashed but then, I generally
> prefer smaller changes than one big lump.
> 
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Hi Harry,

You're welcome.  Normally I too agree that squashing is better but since 
that part of the tree is less familiar I decided to go for a easily 
bisectable patchset in case I did fubar something.  Mostly I just 
compile test as I go to make sure I didn't typo anything.

I've pushed these to drm-next.  Is there any other place you'd like me 
to merge them?

Cheers,
Tom
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* Re: Various cleanups for amdgpu_dm
       [not found]         ` <6dadea86-5a2c-e193-d02f-27515408b24c-5C7GfCeVMHo@public.gmane.org>
@ 2017-10-17 23:23           ` Harry Wentland
  0 siblings, 0 replies; 18+ messages in thread
From: Harry Wentland @ 2017-10-17 23:23 UTC (permalink / raw)
  To: Tom St Denis, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On 2017-10-17 05:43 PM, Tom St Denis wrote:
> On 17/10/17 04:30 PM, Harry Wentland wrote:
>> Thanks for these cleanups.
>>
>> Some of these could possibly squashed but then, I generally
>> prefer smaller changes than one big lump.
>>
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
> 
> Hi Harry,
> 
> You're welcome.  Normally I too agree that squashing is better but since that part of the tree is less familiar I decided to go for a easily bisectable patchset in case I did fubar something.  Mostly I just compile test as I go to make sure I didn't typo anything.
> 

Yeah, definitely better to keep it small, especially on unfamiliar territory.

> I've pushed these to drm-next.  Is there any other place you'd like me to merge them?
> 

amd-staging-drm-next is the right place. I'll backmerge them to our internal tree from there.

Harry

> Cheers,
> Tom
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

end of thread, other threads:[~2017-10-17 23:23 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-17 16:18 Various cleanups for amdgpu_dm Tom St Denis
     [not found] ` <20171017161912.11357-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
2017-10-17 16:19   ` [PATCH 01/13] drm/amd/display: Simplify dm_late_init() Tom St Denis
2017-10-17 16:19   ` [PATCH 02/13] drm/amd/display: Fix indentation in dm_suspend() Tom St Denis
2017-10-17 16:19   ` [PATCH 03/13] drm/amd/display: Fix indentation in dm_resume() Tom St Denis
2017-10-17 16:19   ` [PATCH 04/13] drm/amd/display: Fix brace style in amdgpu_dm_update_connector_after_detect() Tom St Denis
2017-10-17 16:19   ` [PATCH 05/13] drm/amd/display: Fix brace style in dm_handle_hpd_rx_irq() Tom St Denis
2017-10-17 16:19   ` [PATCH 06/13] drm/amd/display: Simplify handle_hpd_rx_irq() Tom St Denis
2017-10-17 16:19   ` [PATCH 07/13] drm/amd/display: Fix brace style in amdgpu_dm_initialize_drm_device() Tom St Denis
2017-10-17 16:19   ` [PATCH 08/13] drm/amd/display: Replace block with strncpy() in fill_audio_info() Tom St Denis
2017-10-17 16:19   ` [PATCH 09/13] drm/amd/display: Fix indentation in create_eml_sink() Tom St Denis
2017-10-17 16:19   ` [PATCH 10/13] drm/amd/display: Tidy up dm_drm_plane_reset() Tom St Denis
2017-10-17 16:19   ` [PATCH 11/13] drm/amd/display: Fix brace style in amdgpu_dm_connector_ddc_get_modes() Tom St Denis
2017-10-17 16:19   ` [PATCH 12/13] drm/amd/display: Remove needless cast in amdgpu_dm_connector_init() Tom St Denis
2017-10-17 16:19   ` [PATCH 13/13] drm/amd/display: Fix brace style Tom St Denis
2017-10-17 17:16   ` Various cleanups for amdgpu_dm Andrey Grodzovsky
2017-10-17 20:30   ` Harry Wentland
     [not found]     ` <5eaea6a7-e3d9-e19d-4d75-3d26e4db9aaf-5C7GfCeVMHo@public.gmane.org>
2017-10-17 21:43       ` Tom St Denis
     [not found]         ` <6dadea86-5a2c-e193-d02f-27515408b24c-5C7GfCeVMHo@public.gmane.org>
2017-10-17 23:23           ` Harry Wentland

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.