Skip to contentSkip to conversation

drm: Fixup failure paths in drm_atomic_helper_set_config

PATCH In review Daniel Vetter 3 participants 3 messages Mar 29, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: Fixup failure paths in drm_atomic_helper_set_config

I've screwed this up when removing the legacy backoff hack.

Fixes 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config")
Cc Harry Wentland <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
---
 drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +2 -1
index 9dc67b52b905..d5915317e7d3 100644
@@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
 	state->acquire_ctx = ctx;
 	ret = __drm_atomic_helper_set_config(set, state);
 	if (ret != 0)
-		return ret;
+		goto fail;
 
 	ret = drm_atomic_commit(state);
 
+fail:
 	drm_atomic_state_put(state);
 	return ret;
 }
Signature · 6 lines
2.11.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

✓ Fi.CI.BAT: success for drm: Fixup failure paths in drm_atomic_helper_set_config

== Series Details ==

== Series Details ==

Series: drm: Fixup failure paths in drm_atomic_helper_set_config
URL : https://patchwork.freedesktop.org/series/22106/
State : success

== Summary ==

Series 22106v1 drm: Fixup failure paths in drm_atomic_helper_set_config
https://patchwork.freedesktop.org/api/1.0/series/22106/revisions/1/mbox/

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time: 459s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time: 458s
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39  time: 577s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time: 548s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time: 584s
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27  time: 505s
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31  time: 513s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 432s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 430s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time: 445s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 518s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 501s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 487s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time: 595s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 492s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time: 601s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time: 486s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 515s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time: 459s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time: 552s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time: 425s

2f9f22b419350cafb06ba7e5342bc461fcb0afca drm-tip: 2017y-03m-29d-12h-52m-56s UTC integration manifest c45202f drm: Fixup failure paths in drm_atomic_helper_set_config

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4346/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Daniel Vetter

Of course. I totally missed that.

Harry

Quoted 22 lines · Daniel Vetter

I've screwed this up when removing the legacy backoff hack.

Fixes 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config")
Cc Harry Wentland <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
---
  drivers/gpu/drm/drm_atomic_helper.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +0 -0
index 9dc67b52b905..d5915317e7d3 100644
@@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
  	state->acquire_ctx = ctx;
  	ret = __drm_atomic_helper_set_config(set, state);

drivers/gpu/drm/drm_atomic_helper.c int drm_atomic_helper_set_config(struct drm_mode_set *set, · line 2304

Quoted 10 lines
drivers/gpu/drm/drm_atomic_helper.c +2 -1
  	if (ret != 0)
-		return ret;
+		goto fail;
 
  	ret = drm_atomic_commit(state);
 
+fail:
  	drm_atomic_state_put(state);
  	return ret;
  }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel