diff mbox series

drm/amd/display: Whitespace cleanup

Message ID 20230327160754.772302-1-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted, archived
Headers show
Series drm/amd/display: Whitespace cleanup | expand

Commit Message

Uwe Kleine-König March 27, 2023, 4:07 p.m. UTC 
Commit 075e2099c32c ("drm/amd/display: Fix race condition in DPIA AUX
transfer") was backported to stable, which I noticed because of git
saying

	linux-6.1/.git/rebase-apply/patch:37154: space before tab in indent.

while applying patch-6.1.21. While fixing the code location that issued
that warning, improve in few more places.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

while reading through the driver I found a few more things that could be
improved. E.g 

| @@ -2625,43 +2625,35 @@ static void emulated_link_detect(struct dc_link *link)
|  		dc_sink_release(prev_sink);
|  
|  	switch (link->connector_signal) {
| -	case SIGNAL_TYPE_HDMI_TYPE_A: {
| +	case SIGNAL_TYPE_HDMI_TYPE_A:
|  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
|  		sink_caps.signal = SIGNAL_TYPE_HDMI_TYPE_A;
|  		break;
| -	}
|  
| -	case SIGNAL_TYPE_DVI_SINGLE_LINK: {
| +	case SIGNAL_TYPE_DVI_SINGLE_LINK:
|  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
|  		sink_caps.signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
|  		break;
| -	}
|  
| -	case SIGNAL_TYPE_DVI_DUAL_LINK: {
| +	case SIGNAL_TYPE_DVI_DUAL_LINK:
|  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
|  		sink_caps.signal = SIGNAL_TYPE_DVI_DUAL_LINK;
|  		break;
| -	}
|  
| -	case SIGNAL_TYPE_LVDS: {
| +	case SIGNAL_TYPE_LVDS:
|  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
|  		sink_caps.signal = SIGNAL_TYPE_LVDS;
|  		break;
| -	}
|  
| -	case SIGNAL_TYPE_EDP: {
| -		sink_caps.transaction_type =
| -			DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
| +	case SIGNAL_TYPE_EDP:
| +		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
|  		sink_caps.signal = SIGNAL_TYPE_EDP;
|  		break;
| -	}
|  
| -	case SIGNAL_TYPE_DISPLAY_PORT: {
| -		sink_caps.transaction_type =
| -			DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
| +	case SIGNAL_TYPE_DISPLAY_PORT:
| +		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
|  		sink_caps.signal = SIGNAL_TYPE_VIRTUAL;
|  		break;
| -	}
|  
|  	default:
|  		DC_ERROR("Invalid connector type! signal:%d\n",

(hopefully that is quoted good enough not to be picked up by git)

Best regards
Uwe

 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)


base-commit: e5dbf24e8b9e6aa0a185d86ce46a7a9c79ebb40f

Comments

Hamza Mahfooz March 27, 2023, 5:39 p.m. UTC | #1 
On 3/27/23 12:07, Uwe Kleine-König wrote:
> Commit 075e2099c32c ("drm/amd/display: Fix race condition in DPIA AUX
> transfer") was backported to stable, which I noticed because of git
> saying
> 
> 	linux-6.1/.git/rebase-apply/patch:37154: space before tab in indent.
> 
> while applying patch-6.1.21. While fixing the code location that issued
> that warning, improve in few more places.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied, thanks!

> ---
> Hello,
> 
> while reading through the driver I found a few more things that could be
> improved. E.g
> 
> | @@ -2625,43 +2625,35 @@ static void emulated_link_detect(struct dc_link *link)
> |  		dc_sink_release(prev_sink);
> |
> |  	switch (link->connector_signal) {
> | -	case SIGNAL_TYPE_HDMI_TYPE_A: {
> | +	case SIGNAL_TYPE_HDMI_TYPE_A:
> |  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
> |  		sink_caps.signal = SIGNAL_TYPE_HDMI_TYPE_A;
> |  		break;
> | -	}
> |
> | -	case SIGNAL_TYPE_DVI_SINGLE_LINK: {
> | +	case SIGNAL_TYPE_DVI_SINGLE_LINK:
> |  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
> |  		sink_caps.signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
> |  		break;
> | -	}
> |
> | -	case SIGNAL_TYPE_DVI_DUAL_LINK: {
> | +	case SIGNAL_TYPE_DVI_DUAL_LINK:
> |  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
> |  		sink_caps.signal = SIGNAL_TYPE_DVI_DUAL_LINK;
> |  		break;
> | -	}
> |
> | -	case SIGNAL_TYPE_LVDS: {
> | +	case SIGNAL_TYPE_LVDS:
> |  		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
> |  		sink_caps.signal = SIGNAL_TYPE_LVDS;
> |  		break;
> | -	}
> |
> | -	case SIGNAL_TYPE_EDP: {
> | -		sink_caps.transaction_type =
> | -			DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
> | +	case SIGNAL_TYPE_EDP:
> | +		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
> |  		sink_caps.signal = SIGNAL_TYPE_EDP;
> |  		break;
> | -	}
> |
> | -	case SIGNAL_TYPE_DISPLAY_PORT: {
> | -		sink_caps.transaction_type =
> | -			DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
> | +	case SIGNAL_TYPE_DISPLAY_PORT:
> | +		sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
> |  		sink_caps.signal = SIGNAL_TYPE_VIRTUAL;
> |  		break;
> | -	}
> |
> |  	default:
> |  		DC_ERROR("Invalid connector type! signal:%d\n",
> 
> (hopefully that is quoted good enough not to be picked up by git)
> 
> Best regards
> Uwe
> 
>   .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 +++++++++----------
>   1 file changed, 13 insertions(+), 13 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 5bac5781a06b..78590e48e8d5 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2300,9 +2300,9 @@ static int dm_late_init(void *handle)
>   	 */
>   	params.min_abm_backlight = 0x28F;
>   	/* In the case where abm is implemented on dmcub,
> -	* dmcu object will be null.
> -	* ABM 2.4 and up are implemented on dmcub.
> -	*/
> +	 * dmcu object will be null.
> +	 * ABM 2.4 and up are implemented on dmcub.
> +	 */
>   	if (dmcu) {
>   		if (!dmcu_load_iram(dmcu, params))
>   			return -EINVAL;
> @@ -7106,13 +7106,13 @@ static uint add_fs_modes(struct amdgpu_dm_connector *aconnector)
>   	/* Standard FPS values
>   	 *
>   	 * 23.976       - TV/NTSC
> -	 * 24 	        - Cinema
> -	 * 25 	        - TV/PAL
> +	 * 24           - Cinema
> +	 * 25           - TV/PAL
>   	 * 29.97        - TV/NTSC
> -	 * 30 	        - TV/NTSC
> -	 * 48 	        - Cinema HFR
> -	 * 50 	        - TV/PAL
> -	 * 60 	        - Commonly used
> +	 * 30           - TV/NTSC
> +	 * 48           - Cinema HFR
> +	 * 50           - TV/PAL
> +	 * 60           - Commonly used
>   	 * 48,72,96,120 - Multiples of 24
>   	 */
>   	static const u32 common_rates[] = {
> @@ -7740,7 +7740,7 @@ static void update_freesync_state_on_stream(
>   		return;
>   
>   	spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
> -        vrr_params = acrtc->dm_irq_params.vrr_params;
> +	vrr_params = acrtc->dm_irq_params.vrr_params;
>   
>   	if (surface) {
>   		mod_freesync_handle_preflip(
> @@ -8321,7 +8321,7 @@ static void amdgpu_dm_commit_audio(struct drm_device *dev,
>   		if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
>   			continue;
>   
> -	notify:
> +notify:
>   		aconnector = to_amdgpu_dm_connector(connector);
>   
>   		mutex_lock(&adev->dm.audio_lock);
> @@ -9337,7 +9337,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
>   skip_modeset:
>   	/* Release extra reference */
>   	if (new_stream)
> -		 dc_stream_release(new_stream);
> +		dc_stream_release(new_stream);
>   
>   	/*
>   	 * We want to do dc stream updates that do not require a
> @@ -10671,7 +10671,7 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(
>   	if (!dc_process_dmub_aux_transfer_async(ctx->dc, link_index, payload)) {
>   		*operation_result = AUX_RET_ERROR_ENGINE_ACQUIRE;
>   		goto out;
> - 	}
> +	}
>   
>   	if (!wait_for_completion_timeout(&adev->dm.dmub_aux_transfer_done, 10 * HZ)) {
>   		DRM_ERROR("wait_for_completion_timeout timeout!");
> 
> base-commit: e5dbf24e8b9e6aa0a185d86ce46a7a9c79ebb40f
diff mbox series

Patch

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 5bac5781a06b..78590e48e8d5 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2300,9 +2300,9 @@  static int dm_late_init(void *handle)
 	 */
 	params.min_abm_backlight = 0x28F;
 	/* In the case where abm is implemented on dmcub,
-	* dmcu object will be null.
-	* ABM 2.4 and up are implemented on dmcub.
-	*/
+	 * dmcu object will be null.
+	 * ABM 2.4 and up are implemented on dmcub.
+	 */
 	if (dmcu) {
 		if (!dmcu_load_iram(dmcu, params))
 			return -EINVAL;
@@ -7106,13 +7106,13 @@  static uint add_fs_modes(struct amdgpu_dm_connector *aconnector)
 	/* Standard FPS values
 	 *
 	 * 23.976       - TV/NTSC
-	 * 24 	        - Cinema
-	 * 25 	        - TV/PAL
+	 * 24           - Cinema
+	 * 25           - TV/PAL
 	 * 29.97        - TV/NTSC
-	 * 30 	        - TV/NTSC
-	 * 48 	        - Cinema HFR
-	 * 50 	        - TV/PAL
-	 * 60 	        - Commonly used
+	 * 30           - TV/NTSC
+	 * 48           - Cinema HFR
+	 * 50           - TV/PAL
+	 * 60           - Commonly used
 	 * 48,72,96,120 - Multiples of 24
 	 */
 	static const u32 common_rates[] = {
@@ -7740,7 +7740,7 @@  static void update_freesync_state_on_stream(
 		return;
 
 	spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
-        vrr_params = acrtc->dm_irq_params.vrr_params;
+	vrr_params = acrtc->dm_irq_params.vrr_params;
 
 	if (surface) {
 		mod_freesync_handle_preflip(
@@ -8321,7 +8321,7 @@  static void amdgpu_dm_commit_audio(struct drm_device *dev,
 		if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
 			continue;
 
-	notify:
+notify:
 		aconnector = to_amdgpu_dm_connector(connector);
 
 		mutex_lock(&adev->dm.audio_lock);
@@ -9337,7 +9337,7 @@  static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
 skip_modeset:
 	/* Release extra reference */
 	if (new_stream)
-		 dc_stream_release(new_stream);
+		dc_stream_release(new_stream);
 
 	/*
 	 * We want to do dc stream updates that do not require a
@@ -10671,7 +10671,7 @@  int amdgpu_dm_process_dmub_aux_transfer_sync(
 	if (!dc_process_dmub_aux_transfer_async(ctx->dc, link_index, payload)) {
 		*operation_result = AUX_RET_ERROR_ENGINE_ACQUIRE;
 		goto out;
- 	}
+	}
 
 	if (!wait_for_completion_timeout(&adev->dm.dmub_aux_transfer_done, 10 * HZ)) {
 		DRM_ERROR("wait_for_completion_timeout timeout!");