Commit 9bd9be5c authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <dev@lankhorst.se>
Link: https://patchwork.freedesktop.org/patch/msgid/e96b1965-ba67-7cc5-2358-826eb5b9b998@lankhorst.se
parents 45a3e24f 54d21740

drivers/accel/qaic/qaic_data.c

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/wait.h>

#include <drm/drm_file.h>

#include <drm/drm_gem.h>

#include <drm/drm_prime.h>

#include <drm/drm_print.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) {

		/* DMABUF/PRIME Path */

		dma_buf_detach(obj->import_attach->dmabuf, obj->import_attach);

		dma_buf_put(obj->import_attach->dmabuf);

		drm_prime_gem_destroy(obj, NULL);

	} else {

		/* Private buffer allocation path */

		qaic_free_sgt(bo->sgt);

drivers/gpu/drm/display/drm_dp_mst_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -3404,7 +3404,7 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, 


	/* Skip failed payloads */

	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);

		return -EIO;

	}