From: Dave Airlie <airlied@redhat.com>
Date: Thu, 10 Oct 2024 23:03:20 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2024-10-10' of https://gitlab.freedesktop.org/drm/misc... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b634acb2a070c072900c56154aa43e2ec2d45b2d;p=users%2Fhch%2Fmisc.git

Merge tag 'drm-misc-fixes-2024-10-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes

Short summary of fixes pull:

fbdev-dma:
- Only clean up deferred I/O if instanciated

nouveau:
- dmem: Fix privileged error in copy engine channel; Fix possible
data leak in migrate_to_ram()
- gsp: Fix coding style

sched:
- Avoid leaking lockdep map

v3d:
- Stop active perfmon before destroying it

vc4:
- Stop active perfmon before destroying it

xe:
- Drop GuC submit_wq pool

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241010133708.GA461532@localhost.localdomain
---

b634acb2a070c072900c56154aa43e2ec2d45b2d
diff --cc drivers/gpu/drm/xe/xe_guc_types.h
index 69046f698271,585f5c274f09..ed150fc09ad0
--- a/drivers/gpu/drm/xe/xe_guc_types.h
+++ b/drivers/gpu/drm/xe/xe_guc_types.h
@@@ -72,17 -72,8 +72,10 @@@ struct xe_guc 
  		atomic_t stopped;
  		/** @submission_state.lock: protects submission state */
  		struct mutex lock;
- #ifdef CONFIG_PROVE_LOCKING
- #define NUM_SUBMIT_WQ	256
- 		/** @submission_state.submit_wq_pool: submission ordered workqueues pool */
- 		struct workqueue_struct *submit_wq_pool[NUM_SUBMIT_WQ];
- 		/** @submission_state.submit_wq_idx: submission ordered workqueue index */
- 		int submit_wq_idx;
- #endif
  		/** @submission_state.enabled: submission is enabled */
  		bool enabled;
 +		/** @submission_state.fini_wq: submit fini wait queue */
 +		wait_queue_head_t fini_wq;
  	} submission_state;
  	/** @hwconfig: Hardware config state */
  	struct {