diff mbox series

[v2] drm/dp_mst: Correct the bug in drm_dp_update_payload_part1()

Message ID 20191203042423.5961-1-Wayne.Lin@amd.com (mailing list archive)
State New, archived
Headers show
Series [v2] drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() | expand

Commit Message

Lin, Wayne Dec. 3, 2019, 4:24 a.m. UTC 
[Why]
If the payload_state is DP_PAYLOAD_DELETE_LOCAL in series, current
code doesn't delete the payload at current index and just move the
index to next one after shuffling payloads.

[How]
Drop the i++ increasing part in for loop head and decide whether
to increase the index or not according to payload_state of current
payload.

Changes since v1:
* Refine the code to have it easy reading
* Amend the commit message to meet the way code is modified now.

Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Lyude Paul Dec. 4, 2019, 8:35 p.m. UTC | #1 
Just pushed to drm-misc-next-fixes as
e5a6ca27eb72c67533ddfc11c06df84beaa167fa, thanks!

On Tue, 2019-12-03 at 12:24 +0800, Wayne Lin wrote:
> [Why]
> If the payload_state is DP_PAYLOAD_DELETE_LOCAL in series, current
> code doesn't delete the payload at current index and just move the
> index to next one after shuffling payloads.
> 
> [How]
> Drop the i++ increasing part in for loop head and decide whether
> to increase the index or not according to payload_state of current
> payload.
> 
> Changes since v1:
> * Refine the code to have it easy reading
> * Amend the commit message to meet the way code is modified now.
> 
> Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
> Reviewed-by: Lyude Paul <lyude@redhat.com>
> ---
>  drivers/gpu/drm/drm_dp_mst_topology.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 81e92b260d7a..4ef6decc0551 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -3176,9 +3176,11 @@ int drm_dp_update_payload_part1(struct
> drm_dp_mst_topology_mgr *mgr)
>  			drm_dp_mst_topology_put_port(port);
>  	}
>  
> -	for (i = 0; i < mgr->max_payloads; i++) {
> -		if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL)
> +	for (i = 0; i < mgr->max_payloads; /* do nothing */) {
> +		if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL)
> {
> +			i++;
>  			continue;
> +		}
>  
>  		DRM_DEBUG_KMS("removing payload %d\n", i);
>  		for (j = i; j < mgr->max_payloads - 1; j++) {
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 81e92b260d7a..4ef6decc0551 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3176,9 +3176,11 @@  int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
 			drm_dp_mst_topology_put_port(port);
 	}
 
-	for (i = 0; i < mgr->max_payloads; i++) {
-		if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL)
+	for (i = 0; i < mgr->max_payloads; /* do nothing */) {
+		if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL) {
+			i++;
 			continue;
+		}
 
 		DRM_DEBUG_KMS("removing payload %d\n", i);
 		for (j = i; j < mgr->max_payloads - 1; j++) {