]> www.infradead.org Git - users/hch/misc.git/commitdiff
Merge tag 'drm-misc-fixes-2024-10-10' of https://gitlab.freedesktop.org/drm/misc...
authorDave Airlie <airlied@redhat.com>
Thu, 10 Oct 2024 23:03:20 +0000 (09:03 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Oct 2024 23:03:30 +0000 (09:03 +1000)
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
1  2 
drivers/gpu/drm/xe/xe_guc_submit.c
drivers/gpu/drm/xe/xe_guc_types.h

Simple merge
index 69046f698271747915d652feb336e9154dfd3aff,585f5c274f0900f7a77acb55326de8806b327e76..ed150fc09ad04f4f3c1e44969fc8e179a1056907
@@@ -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 {