korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 23:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm fix for 6.1-rc1

Browse Source 
sched:
 - revert patch causing oopses
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEEKbZHaGwW9KfbeusDHTzWXnEhr4FAmM/ln4ACgkQDHTzWXnE
 hr6hORAAiS429QNH9dmz0cQOpDnEj+jlRY8YWbZ7vqkuiQis8rvj9AqlCybrUOXT
 QLPQ84K8whBcano+mEhhl0crtvL0ZANaa2kAa/Y4xkyGzXEqTs7Dg9z2xHZeFZ1q
 QwVZ+ezGZoNy2rmlQS4eOkaK3tl4CHlyf3YdpZtD9VTF0CL8CxMo9pObEo6022fO
 fRv3jVHMj3xU/rCkdUQb/KeQatcsEJMV34ikwV11HTO6+kgYkL+4BGMnqJHapCIg
 jLvTgKPiH277QFRp4c5XTcwT+SxZXnQRsojjAGjv60tHe91Gge8yyCxR5+TfDXcg
 AlM6HD3NpSKCBykJ90qH6RsBfAhPEfVmvjKPYtUxXeD1gF7+Sj+2DgFU5HaT8VVS
 rEuCueCydO1nhVJzkxzqQ/B2MswPz9mGEJCBXIhGDp1QY8hOHLRXe5ZKyjfU3pA9
 uFknYsCXykgnDXONXMbLgIlMs+4okzu55/C72HoqxHypqZz4y4V1+KwQ5jtiOeto
 KOTWjC65gFvsWEPvUJzHwHG7t6PyMpVn1ELkJteyBbdnGJFQyyq3Jtv19VXvTZ98
 JpIVljN6vRGQUUFsBbiRwz6C0q71rn0742TBYOuDz2a7DNGS7vZUshycTVuEPkX6
 XB1A+fWs84KpCKIibICE0CUK9OIPKoWRpUUJQ2SnphuQGMJlUDA=
 =yUOx
 -----END PGP SIGNATURE-----

Merge tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/drm/drm

Pull drm fix from Dave Airlie:
 "This reverts the patch I found with rough bisection to instability
  around fences and the oops I got from netconsole.

  sched:
   - revert patch causing oopses"

* tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/drm/drm:
  Revert "drm/sched: Use parent fence instead of finished"
This commit is contained in:
Linus Torvalds 2022-10-07 09:47:47 -07:00
commit 9d84bb40bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/scheduler/sched_main.c
View File

@ -829,7 +829,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
job = list_first_entry_or_null(&sched->pending_list,
struct drm_sched_job, list);
if (job && dma_fence_is_signaled(job->s_fence->parent)) {
if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
/* remove job from pending_list */
list_del_init(&job->list);
@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
if (next) {
next->s_fence->scheduled.timestamp =
job->s_fence->parent->timestamp;
job->s_fence->finished.timestamp;
/* start TO timer for next job */
drm_sched_start_timeout(sched);
}