UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag 'drm-misc-fixes-2023-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 

drm-misc-fixes for v6.4:
- Qaic imported dma-buf fix.
- Fix null pointer deref when printing a dp-mst message.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <dev@lankhorst.se>
Link: https://patchwork.freedesktop.org/patch/msgid/e96b1965-ba67-7cc5-2358-826eb5b9b998@lankhorst.se
This commit is contained in:
Dave Airlie 2023-06-23 12:16:47 +10:00
parent 45a3e24f65 54d217406a
commit 9bd9be5cba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/accel/qaic/qaic_data.c
View File

@ -23,6 +23,7 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <drm/drm_file.h> #include <drm/drm_file.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_prime.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <uapi/drm/qaic_accel.h> #include <uapi/drm/qaic_accel.h>
@ -616,8 +617,7 @@ static void qaic_free_object(struct drm_gem_object *obj)
if (obj->import_attach) { if (obj->import_attach) {
/* DMABUF/PRIME Path */ /* DMABUF/PRIME Path */
dma_buf_detach(obj->import_attach->dmabuf, obj->import_attach); drm_prime_gem_destroy(obj, NULL);
dma_buf_put(obj->import_attach->dmabuf);
} else { } else {
/* Private buffer allocation path */ /* Private buffer allocation path */
qaic_free_sgt(bo->sgt); qaic_free_sgt(bo->sgt);

2
drivers/gpu/drm/display/drm_dp_mst_topology.c
View File

@ -3404,7 +3404,7 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
/* Skip failed payloads */ /* Skip failed payloads */
if (payload->vc_start_slot == -1) { if (payload->vc_start_slot == -1) {
drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n", drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
payload->port->connector->name); payload->port->connector->name);
return -EIO; return -EIO;
} }