]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'v6.13-rc6' into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 10 Jan 2025 04:24:17 +0000 (14:24 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 10 Jan 2025 04:24:17 +0000 (14:24 +1000)
This backmerges Linux 6.13-rc6 this is need for the newer pulls.

Signed-off-by: Dave Airlie <airlied@redhat.com>
1  2 
MAINTAINERS
drivers/accel/ivpu/ivpu_pm.c
drivers/gpu/drm/Kconfig
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
drivers/gpu/drm/drm_modes.c
drivers/gpu/drm/xe/xe_exec_queue.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index 8948f50ee58ff29cd8cac343eb79fa0a6ccf100b,268cd3123be9d9d4b0a67cfedb93af0ba6394409..7e1abbbfba1218fa5de0155a672bf621974af6fd
@@@ -784,7 -780,9 +784,6 @@@ void xe_exec_queue_update_run_ticks(str
        /* Synchronize with unbind while holding the xe file open */
        if (!drm_dev_enter(&xe->drm, &idx))
                return;
 -
 -      xef = q->vm->xef;
--
        /*
         * Only sample the first LRC. For parallel submission, all of them are
         * scheduled together and we compensate that below by multiplying by