Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-fixes-2023-06-23' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"Very quiet last week, just two misc fixes, one dp-mst and one qaic:
qaic:
- dma-buf import fix
dp-mst:
- fix NULL ptr deref"
[ It turns out it was a quiet week because Alex Deucher hadn't sent in
his pending AMD changes. So they are coming next - Linus ]
* tag 'drm-fixes-2023-06-23' of git://anongit.freedesktop.org/drm/drm:
drm: use mgr->dev in drm_dbg_kms in drm_dp_add_payload_part2
accel/qaic: Call DRM helper function to destroy prime GEM
+3
-3
+2
-2
drivers/accel/qaic/qaic_data.c
+2
-2
drivers/accel/qaic/qaic_data.c
···
23
23
#include <linux/wait.h>
24
24
#include <drm/drm_file.h>
25
25
#include <drm/drm_gem.h>
26
+
#include <drm/drm_prime.h>
26
27
#include <drm/drm_print.h>
27
28
#include <uapi/drm/qaic_accel.h>
28
29
···
617
616
618
617
if (obj->import_attach) {
619
618
/* DMABUF/PRIME Path */
620
-
dma_buf_detach(obj->import_attach->dmabuf, obj->import_attach);
621
-
dma_buf_put(obj->import_attach->dmabuf);
619
+
drm_prime_gem_destroy(obj, NULL);
622
620
} else {
623
621
/* Private buffer allocation path */
624
622
qaic_free_sgt(bo->sgt);
+1
-1
drivers/gpu/drm/display/drm_dp_mst_topology.c
+1
-1
drivers/gpu/drm/display/drm_dp_mst_topology.c
···
3404
3404
3405
3405
/* Skip failed payloads */
3406
3406
if (payload->vc_start_slot == -1) {
3407
-
drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
3407
+
drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
3408
3408
payload->port->connector->name);
3409
3409
return -EIO;
3410
3410
}