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

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

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

 into drm-fixes

A pixel byte swap fix for st7586, a null pointer dereference fix for
gud, two timings fixes for ti-sn65dsi83, an initialization fix for ivpu,
and a runtime suspend deadlock fix for amdxdna.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260312-accurate-ambrosial-trout-bfabf8@houat
parents 50ae4ce2 49973e2a

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -8626,9 +8626,8 @@ F: drivers/gpu/drm/lima/ 
F:	include/uapi/drm/lima_drm.h









DRM DRIVERS FOR LOONGSON









M:	Sui Jingfeng <suijingfeng@loongson.cn>









L:	dri-devel@lists.freedesktop.org









S:	Supported









S:	Orphan









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/loongson/








































drivers/accel/amdxdna/aie2_ctx.c



+2
−12






























Original line number
Diff line number
Diff line







@@ -165,7 +165,6 @@ aie2_sched_notify(struct amdxdna_sched_job *job)

















	trace_xdna_job(&job->base, job->hwctx->name, "signaled fence", job->seq);



















	amdxdna_pm_suspend_put(job->hwctx->client->xdna);









	job->hwctx->priv->completed++;









	dma_fence_signal(fence);


















@@ -290,19 +289,11 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)







	struct dma_fence *fence;









	int ret;



















	ret = amdxdna_pm_resume_get(hwctx->client->xdna);









	if (ret)









		return NULL;



















	if (!hwctx->priv->mbox_chann) {









		amdxdna_pm_suspend_put(hwctx->client->xdna);









	if (!hwctx->priv->mbox_chann)









		return NULL;









	}



















	if (!mmget_not_zero(job->mm)) {









		amdxdna_pm_suspend_put(hwctx->client->xdna);









	if (!mmget_not_zero(job->mm))









		return ERR_PTR(-ESRCH);









	}



















	kref_get(&job->refcnt);









	fence = dma_fence_get(job->fence);








@@ -333,7 +324,6 @@ aie2_sched_job_run(struct drm_sched_job *sched_job)

















out:









	if (ret) {









		amdxdna_pm_suspend_put(hwctx->client->xdna);









		dma_fence_put(job->fence);









		aie2_job_put(job);









		mmput(job->mm);
































drivers/accel/amdxdna/amdxdna_ctx.c



+10
−0






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@







#include "amdxdna_ctx.h"









#include "amdxdna_gem.h"









#include "amdxdna_pci_drv.h"









#include "amdxdna_pm.h"



















#define MAX_HWCTX_ID		255









#define MAX_ARG_COUNT		4095








@@ -445,6 +446,7 @@ amdxdna_arg_bos_lookup(struct amdxdna_client *client,







void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job)









{









	trace_amdxdna_debug_point(job->hwctx->name, job->seq, "job release");









	amdxdna_pm_suspend_put(job->hwctx->client->xdna);









	amdxdna_arg_bos_put(job);









	amdxdna_gem_put_obj(job->cmd_bo);









	dma_fence_put(job->fence);








@@ -482,6 +484,12 @@ int amdxdna_cmd_submit(struct amdxdna_client *client,







		goto cmd_put;









	}



















	ret = amdxdna_pm_resume_get(xdna);









	if (ret) {









		XDNA_ERR(xdna, "Resume failed, ret %d", ret);









		goto put_bos;









	}



















	idx = srcu_read_lock(&client->hwctx_srcu);









	hwctx = xa_load(&client->hwctx_xa, hwctx_hdl);









	if (!hwctx) {








@@ -522,6 +530,8 @@ int amdxdna_cmd_submit(struct amdxdna_client *client,







	dma_fence_put(job->fence);









unlock_srcu:









	srcu_read_unlock(&client->hwctx_srcu, idx);









	amdxdna_pm_suspend_put(xdna);









put_bos:









	amdxdna_arg_bos_put(job);









cmd_put:









	amdxdna_gem_put_obj(job->cmd_bo);
































drivers/accel/ivpu/ivpu_hw_40xx_reg.h



+0
−6






























Original line number
Diff line number
Diff line







@@ -121,12 +121,6 @@







#define VPU_50XX_HOST_SS_AON_PWR_ISLAND_STATUS_DLY			0x0003006cu









#define VPU_50XX_HOST_SS_AON_PWR_ISLAND_STATUS_DLY_STATUS_DLY_MASK	GENMASK(7, 0)



















#define VPU_40XX_HOST_SS_AON_RETENTION0                                 0x0003000cu









#define VPU_40XX_HOST_SS_AON_RETENTION1                                 0x00030010u









#define VPU_40XX_HOST_SS_AON_RETENTION2                                 0x00030014u









#define VPU_40XX_HOST_SS_AON_RETENTION3                                 0x00030018u









#define VPU_40XX_HOST_SS_AON_RETENTION4                                 0x0003001cu



















#define VPU_40XX_HOST_SS_AON_IDLE_GEN					0x00030200u









#define VPU_40XX_HOST_SS_AON_IDLE_GEN_EN_MASK				BIT_MASK(0)









#define VPU_40XX_HOST_SS_AON_IDLE_GEN_HW_PG_EN_MASK			BIT_MASK(1)
































drivers/accel/ivpu/ivpu_hw_ip.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -931,7 +931,6 @@ static int soc_cpu_boot_40xx(struct ivpu_device *vdev)

















static int soc_cpu_boot_60xx(struct ivpu_device *vdev)









{









	REGV_WR64(VPU_40XX_HOST_SS_AON_RETENTION1, vdev->fw->mem_bp->vpu_addr);









	soc_cpu_set_entry_point_40xx(vdev, vdev->fw->cold_boot_entry_point);



















	return 0;