Commit 1cd0c7af authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2025-08-21' of... 

Merge tag 'drm-misc-next-2025-08-21' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for v6.18:

Core Changes:

bridge:
- Support Content Protection property

gpuvm:
- Support madvice in Xe driver

mipi:
- Add more multi-read/write helpers for improved error handling

Driver Changes:

amdxdna:
- Refactoring wrt. hardware contexts

bridge:
- display-connector: Improve DP display detection

panel:
- Fix includes in various drivers

panthor:
- Add support for Mali G710, G510, G310, Gx15, Gx20, Gx25
- Improve cache flushing

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250821073822.GA45904@2a02-2454-fd5e-fd00-8f09-b5f-980b-a7ef.dyn6.pyur.net
parents dd489c01 043d9c69

drivers/accel/amdxdna/aie2_ctx.c

+22 −16
Original line number Diff line number Diff line
@@ -133,11 +133,20 @@ static void aie2_hwctx_wait_for_idle(struct amdxdna_hwctx *hwctx) 
	dma_fence_put(fence);

}



static int aie2_hwctx_suspend_cb(struct amdxdna_hwctx *hwctx, void *arg)

{

	struct amdxdna_dev *xdna = hwctx->client->xdna;



	aie2_hwctx_wait_for_idle(hwctx);

	aie2_hwctx_stop(xdna, hwctx, NULL);

	aie2_hwctx_status_shift_stop(hwctx);



	return 0;

}



void aie2_hwctx_suspend(struct amdxdna_client *client)

{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;



	/*

	 * Command timeout is unlikely. But if it happens, it doesn't
@@ -145,19 +154,20 @@ void aie2_hwctx_suspend(struct amdxdna_client *client) 
	 * and abort all commands.

	 */

	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	guard(mutex)(&client->hwctx_lock);

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		aie2_hwctx_wait_for_idle(hwctx);

		aie2_hwctx_stop(xdna, hwctx, NULL);

		aie2_hwctx_status_shift_stop(hwctx);

	amdxdna_hwctx_walk(client, NULL, aie2_hwctx_suspend_cb);

}



static int aie2_hwctx_resume_cb(struct amdxdna_hwctx *hwctx, void *arg)

{

	struct amdxdna_dev *xdna = hwctx->client->xdna;



	aie2_hwctx_status_restore(hwctx);

	return aie2_hwctx_restart(xdna, hwctx);

}



void aie2_hwctx_resume(struct amdxdna_client *client)

int aie2_hwctx_resume(struct amdxdna_client *client)

{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;



	/*

	 * The resume path cannot guarantee that mailbox channel can be
@@ -165,11 +175,7 @@ void aie2_hwctx_resume(struct amdxdna_client *client) 
	 * mailbox channel, error will return.

	 */

	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	guard(mutex)(&client->hwctx_lock);

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		aie2_hwctx_status_restore(hwctx);

		aie2_hwctx_restart(xdna, hwctx);

	}

	return amdxdna_hwctx_walk(client, NULL, aie2_hwctx_resume_cb);

}



static void

drivers/accel/amdxdna/aie2_message.c

+12 −9
Original line number Diff line number Diff line
@@ -290,18 +290,25 @@ int aie2_map_host_buf(struct amdxdna_dev_hdl *ndev, u32 context_id, u64 addr, u6 
	return 0;

}



static int amdxdna_hwctx_col_map(struct amdxdna_hwctx *hwctx, void *arg)

{

	u32 *bitmap = arg;



	*bitmap |= GENMASK(hwctx->start_col + hwctx->num_col - 1, hwctx->start_col);



	return 0;

}



int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf,

		      u32 size, u32 *cols_filled)

{

	DECLARE_AIE2_MSG(aie_column_info, MSG_OP_QUERY_COL_STATUS);

	struct amdxdna_dev *xdna = ndev->xdna;

	struct amdxdna_client *client;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;

	dma_addr_t dma_addr;

	u32 aie_bitmap = 0;

	u8 *buff_addr;

	int ret, idx;

	int ret;



	buff_addr = dma_alloc_noncoherent(xdna->ddev.dev, size, &dma_addr,

					  DMA_FROM_DEVICE, GFP_KERNEL);
@@ -309,12 +316,8 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, 
		return -ENOMEM;



	/* Go through each hardware context and mark the AIE columns that are active */

	list_for_each_entry(client, &xdna->client_list, node) {

		idx = srcu_read_lock(&client->hwctx_srcu);

		amdxdna_for_each_hwctx(client, hwctx_id, hwctx)

			aie_bitmap |= amdxdna_hwctx_col_map(hwctx);

		srcu_read_unlock(&client->hwctx_srcu, idx);

	}

	list_for_each_entry(client, &xdna->client_list, node)

		amdxdna_hwctx_walk(client, &aie_bitmap, amdxdna_hwctx_col_map);



	*cols_filled = 0;

	req.dump_buff_addr = dma_addr;

drivers/accel/amdxdna/aie2_pci.c

+44 −49
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <drm/drm_managed.h>

#include <drm/drm_print.h>

#include <drm/gpu_scheduler.h>

#include <linux/cleanup.h>

#include <linux/errno.h>

#include <linux/firmware.h>

#include <linux/iommu.h>
@@ -465,8 +466,11 @@ static int aie2_hw_resume(struct amdxdna_dev *xdna) 
		return ret;

	}



	list_for_each_entry(client, &xdna->client_list, node)

		aie2_hwctx_resume(client);

	list_for_each_entry(client, &xdna->client_list, node) {

		ret = aie2_hwctx_resume(client);

		if (ret)

			break;

	}



	return ret;

}
@@ -779,65 +783,56 @@ static int aie2_get_clock_metadata(struct amdxdna_client *client, 
	return ret;

}



static int aie2_get_hwctx_status(struct amdxdna_client *client,

				 struct amdxdna_drm_get_info *args)

static int aie2_hwctx_status_cb(struct amdxdna_hwctx *hwctx, void *arg)

{

	struct amdxdna_drm_query_hwctx __user *buf;

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_drm_query_hwctx *tmp;

	struct amdxdna_client *tmp_client;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;

	bool overflow = false;

	u32 req_bytes = 0;

	u32 hw_i = 0;

	int ret = 0;

	int idx;

	struct amdxdna_drm_query_hwctx __user *buf, *tmp __free(kfree) = NULL;

	struct amdxdna_drm_get_info *get_info_args = arg;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	if (get_info_args->buffer_size < sizeof(*tmp))

		return -EINVAL;



	tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);

	if (!tmp)

		return -ENOMEM;



	buf = u64_to_user_ptr(args->buffer);

	list_for_each_entry(tmp_client, &xdna->client_list, node) {

		idx = srcu_read_lock(&tmp_client->hwctx_srcu);

		amdxdna_for_each_hwctx(tmp_client, hwctx_id, hwctx) {

			req_bytes += sizeof(*tmp);

			if (args->buffer_size < req_bytes) {

				/* Continue iterating to get the required size */

				overflow = true;

				continue;

			}



			memset(tmp, 0, sizeof(*tmp));

			tmp->pid = tmp_client->pid;

	tmp->pid = hwctx->client->pid;

	tmp->context_id = hwctx->id;

	tmp->start_col = hwctx->start_col;

	tmp->num_col = hwctx->num_col;

	tmp->command_submissions = hwctx->priv->seq;

	tmp->command_completions = hwctx->priv->completed;



			if (copy_to_user(&buf[hw_i], tmp, sizeof(*tmp))) {

				ret = -EFAULT;

				srcu_read_unlock(&tmp_client->hwctx_srcu, idx);

				goto out;

			}

			hw_i++;

		}

		srcu_read_unlock(&tmp_client->hwctx_srcu, idx);

	buf = u64_to_user_ptr(get_info_args->buffer);



	if (copy_to_user(buf, tmp, sizeof(*tmp)))

		return -EFAULT;



	get_info_args->buffer += sizeof(*tmp);

	get_info_args->buffer_size -= sizeof(*tmp);



	return 0;

}



	if (overflow) {

		XDNA_ERR(xdna, "Invalid buffer size. Given: %u Need: %u.",

			 args->buffer_size, req_bytes);

		ret = -EINVAL;

static int aie2_get_hwctx_status(struct amdxdna_client *client,

				 struct amdxdna_drm_get_info *args)

{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_drm_get_info info_args;

	struct amdxdna_client *tmp_client;

	int ret;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));



	info_args.buffer = args->buffer;

	info_args.buffer_size = args->buffer_size;



	list_for_each_entry(tmp_client, &xdna->client_list, node) {

		ret = amdxdna_hwctx_walk(tmp_client, &info_args, aie2_hwctx_status_cb);

		if (ret)

			break;

	}



out:

	kfree(tmp);

	args->buffer_size = req_bytes;

	args->buffer_size = (u32)(info_args.buffer - args->buffer);

	return ret;

}

drivers/accel/amdxdna/aie2_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ int aie2_hwctx_init(struct amdxdna_hwctx *hwctx); 
void aie2_hwctx_fini(struct amdxdna_hwctx *hwctx);

int aie2_hwctx_config(struct amdxdna_hwctx *hwctx, u32 type, u64 value, void *buf, u32 size);

void aie2_hwctx_suspend(struct amdxdna_client *client);

void aie2_hwctx_resume(struct amdxdna_client *client);

int aie2_hwctx_resume(struct amdxdna_client *client);

int aie2_cmd_submit(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job, u64 *seq);

void aie2_hmm_invalidate(struct amdxdna_gem_obj *abo, unsigned long cur_seq);

drivers/accel/amdxdna/amdxdna_ctx.c

+20 −6
Original line number Diff line number Diff line
@@ -68,14 +68,30 @@ static void amdxdna_hwctx_destroy_rcu(struct amdxdna_hwctx *hwctx, 
	synchronize_srcu(ss);



	/* At this point, user is not able to submit new commands */

	mutex_lock(&xdna->dev_lock);

	xdna->dev_info->ops->hwctx_fini(hwctx);

	mutex_unlock(&xdna->dev_lock);



	kfree(hwctx->name);

	kfree(hwctx);

}



int amdxdna_hwctx_walk(struct amdxdna_client *client, void *arg,

		       int (*walk)(struct amdxdna_hwctx *hwctx, void *arg))

{

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;

	int ret = 0, idx;



	idx = srcu_read_lock(&client->hwctx_srcu);

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		ret = walk(hwctx, arg);

		if (ret)

			break;

	}

	srcu_read_unlock(&client->hwctx_srcu, idx);



	return ret;

}



void *amdxdna_cmd_get_payload(struct amdxdna_gem_obj *abo, u32 *size)

{

	struct amdxdna_cmd *cmd = abo->mem.kva;
@@ -126,16 +142,12 @@ void amdxdna_hwctx_remove_all(struct amdxdna_client *client) 
	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;



	mutex_lock(&client->hwctx_lock);

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		XDNA_DBG(client->xdna, "PID %d close HW context %d",

			 client->pid, hwctx->id);

		xa_erase(&client->hwctx_xa, hwctx->id);

		mutex_unlock(&client->hwctx_lock);

		amdxdna_hwctx_destroy_rcu(hwctx, &client->hwctx_srcu);

		mutex_lock(&client->hwctx_lock);

	}

	mutex_unlock(&client->hwctx_lock);

}



int amdxdna_drm_create_hwctx_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
@@ -225,6 +237,7 @@ int amdxdna_drm_destroy_hwctx_ioctl(struct drm_device *dev, void *data, struct d 
	if (!drm_dev_enter(dev, &idx))

		return -ENODEV;



	mutex_lock(&xdna->dev_lock);

	hwctx = xa_erase(&client->hwctx_xa, args->handle);

	if (!hwctx) {

		ret = -EINVAL;
@@ -241,6 +254,7 @@ int amdxdna_drm_destroy_hwctx_ioctl(struct drm_device *dev, void *data, struct d 


	XDNA_DBG(xdna, "PID %d destroyed HW context %d", client->pid, args->handle);

out:

	mutex_unlock(&xdna->dev_lock);

	drm_dev_exit(idx);

	return ret;

}