Commit 3d3234d5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2026-03-05' of... 

Merge tag 'drm-misc-fixes-2026-03-05' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

A return type fix for ttm, a display fix for solomon, several misc fixes
for amdxdna, a DSI clock rate fix for rz-du, a uapi fix for syncobj, a
possible build failure fix for dma-buf, a doc warning fix for sched, a
build failure fix for ttm tests, and a crash fix when suspended for
nouveau.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260305-ludicrous-quirky-raven-7cdafd@houat
parents 3fcb1cbd 8f3c6f08

drivers/accel/amdxdna/aie2_ctx.c

+8 −15
Original line number Diff line number Diff line
@@ -186,13 +186,13 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size) 
	cmd_abo = job->cmd_bo;



	if (unlikely(job->job_timeout)) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);

		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);

		ret = -EINVAL;

		goto out;

	}



	if (unlikely(!data) || unlikely(size != sizeof(u32))) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);

		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);

		ret = -EINVAL;

		goto out;

	}
@@ -202,7 +202,7 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size) 
	if (status == AIE2_STATUS_SUCCESS)

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);

	else

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);

		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ERROR);



out:

	aie2_sched_notify(job);
@@ -244,13 +244,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size) 
	cmd_abo = job->cmd_bo;



	if (unlikely(job->job_timeout)) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);

		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);

		ret = -EINVAL;

		goto out;

	}



	if (unlikely(!data) || unlikely(size != sizeof(u32) * 3)) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);

		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);

		ret = -EINVAL;

		goto out;

	}
@@ -270,19 +270,12 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size) 
		 fail_cmd_idx, fail_cmd_status);



	if (fail_cmd_status == AIE2_STATUS_SUCCESS) {

		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);

		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ABORT);

		ret = -EINVAL;

		goto out;

	} else {

		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ERROR);

	}

	amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);



	if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {

		struct amdxdna_cmd_chain *cc = amdxdna_cmd_get_payload(cmd_abo, NULL);



		cc->error_index = fail_cmd_idx;

		if (cc->error_index >= cc->command_count)

			cc->error_index = 0;

	}

out:

	aie2_sched_notify(job);

	return ret;

drivers/accel/amdxdna/aie2_message.c

+16 −5
Original line number Diff line number Diff line
@@ -40,11 +40,8 @@ static int aie2_send_mgmt_msg_wait(struct amdxdna_dev_hdl *ndev, 
		return -ENODEV;



	ret = xdna_send_msg_wait(xdna, ndev->mgmt_chann, msg);

	if (ret == -ETIME) {

		xdna_mailbox_stop_channel(ndev->mgmt_chann);

		xdna_mailbox_destroy_channel(ndev->mgmt_chann);

		ndev->mgmt_chann = NULL;

	}

	if (ret == -ETIME)

		aie2_destroy_mgmt_chann(ndev);



	if (!ret && *hdl->status != AIE2_STATUS_SUCCESS) {

		XDNA_ERR(xdna, "command opcode 0x%x failed, status 0x%x",
@@ -914,6 +911,20 @@ void aie2_msg_init(struct amdxdna_dev_hdl *ndev) 
		ndev->exec_msg_ops = &legacy_exec_message_ops;

}



void aie2_destroy_mgmt_chann(struct amdxdna_dev_hdl *ndev)

{

	struct amdxdna_dev *xdna = ndev->xdna;



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



	if (!ndev->mgmt_chann)

		return;



	xdna_mailbox_stop_channel(ndev->mgmt_chann);

	xdna_mailbox_destroy_channel(ndev->mgmt_chann);

	ndev->mgmt_chann = NULL;

}



static inline struct amdxdna_gem_obj *

aie2_cmdlist_get_cmd_buf(struct amdxdna_sched_job *job)

{

drivers/accel/amdxdna/aie2_pci.c

+2 −5
Original line number Diff line number Diff line
@@ -330,9 +330,7 @@ static void aie2_hw_stop(struct amdxdna_dev *xdna) 


	aie2_runtime_cfg(ndev, AIE2_RT_CFG_CLK_GATING, NULL);

	aie2_mgmt_fw_fini(ndev);

	xdna_mailbox_stop_channel(ndev->mgmt_chann);

	xdna_mailbox_destroy_channel(ndev->mgmt_chann);

	ndev->mgmt_chann = NULL;

	aie2_destroy_mgmt_chann(ndev);

	drmm_kfree(&xdna->ddev, ndev->mbox);

	ndev->mbox = NULL;

	aie2_psp_stop(ndev->psp_hdl);
@@ -441,8 +439,7 @@ static int aie2_hw_start(struct amdxdna_dev *xdna) 
	return 0;



destroy_mgmt_chann:

	xdna_mailbox_stop_channel(ndev->mgmt_chann);

	xdna_mailbox_destroy_channel(ndev->mgmt_chann);

	aie2_destroy_mgmt_chann(ndev);

stop_psp:

	aie2_psp_stop(ndev->psp_hdl);

fini_smu:

drivers/accel/amdxdna/aie2_pci.h

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ int aie2_get_array_async_error(struct amdxdna_dev_hdl *ndev, 


/* aie2_message.c */

void aie2_msg_init(struct amdxdna_dev_hdl *ndev);

void aie2_destroy_mgmt_chann(struct amdxdna_dev_hdl *ndev);

int aie2_suspend_fw(struct amdxdna_dev_hdl *ndev);

int aie2_resume_fw(struct amdxdna_dev_hdl *ndev);

int aie2_set_runtime_cfg(struct amdxdna_dev_hdl *ndev, u32 type, u64 value);

drivers/accel/amdxdna/amdxdna_ctx.c

+27 −0
Original line number Diff line number Diff line
@@ -135,6 +135,33 @@ u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo) 
	return INVALID_CU_IDX;

}



int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,

			  struct amdxdna_sched_job *job, u32 cmd_idx,

			  enum ert_cmd_state error_state)

{

	struct amdxdna_client *client = job->hwctx->client;

	struct amdxdna_cmd *cmd = abo->mem.kva;

	struct amdxdna_cmd_chain *cc = NULL;



	cmd->header &= ~AMDXDNA_CMD_STATE;

	cmd->header |= FIELD_PREP(AMDXDNA_CMD_STATE, error_state);



	if (amdxdna_cmd_get_op(abo) == ERT_CMD_CHAIN) {

		cc = amdxdna_cmd_get_payload(abo, NULL);

		cc->error_index = (cmd_idx < cc->command_count) ? cmd_idx : 0;

		abo = amdxdna_gem_get_obj(client, cc->data[0], AMDXDNA_BO_CMD);

		if (!abo)

			return -EINVAL;

		cmd = abo->mem.kva;

	}



	memset(cmd->data, 0xff, abo->mem.size - sizeof(*cmd));

	if (cc)

		amdxdna_gem_put_obj(abo);



	return 0;

}



/*

 * This should be called in close() and remove(). DO NOT call in other syscalls.

 * This guarantee that when hwctx and resources will be released, if user