Commit 395436f3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-02-20' of... 

Merge tag 'drm-misc-fixes-2025-02-20' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

An reset signal polarity fix for the jd9365da-h3 panel, a folio handling
fix and config fix in nouveau, a dmem cgroup descendant pool handling
fix, and a missing header for amdxdna.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250220-glorious-cockle-of-might-5b35f7@houat
parents 0ad2507d 838c17fd

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -7425,7 +7425,6 @@ F: Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml 
F:	drivers/gpu/drm/panel/panel-novatek-nt36672a.c









DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS









M:	Karol Herbst <kherbst@redhat.com>









M:	Lyude Paul <lyude@redhat.com>









M:	Danilo Krummrich <dakr@kernel.org>









L:	dri-devel@lists.freedesktop.org








@@ -24064,7 +24063,6 @@ F:	tools/testing/selftests/ftrace/







TRACING MMIO ACCESSES (MMIOTRACE)









M:	Steven Rostedt <rostedt@goodmis.org>









M:	Masami Hiramatsu <mhiramat@kernel.org>









R:	Karol Herbst <karolherbst@gmail.com>









R:	Pekka Paalanen <ppaalanen@gmail.com>









L:	linux-kernel@vger.kernel.org









L:	nouveau@lists.freedesktop.org

























drivers/accel/amdxdna/amdxdna_mailbox.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







#include <linux/bitfield.h>









#include <linux/interrupt.h>









#include <linux/iopoll.h>









#include <linux/slab.h>









#include <linux/xarray.h>



















#define CREATE_TRACE_POINTS
































drivers/gpu/drm/nouveau/nouveau_svm.c



+7
−2






























Original line number
Diff line number
Diff line







@@ -590,6 +590,7 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,







	unsigned long timeout =









		jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);









	struct mm_struct *mm = svmm->notifier.mm;









	struct folio *folio;









	struct page *page;









	unsigned long start = args->p.addr;









	unsigned long notifier_seq;








@@ -616,12 +617,16 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,







			ret = -EINVAL;









			goto out;









		}









		folio = page_folio(page);



















		mutex_lock(&svmm->mutex);









		if (!mmu_interval_read_retry(&notifier->notifier,









					     notifier_seq))









			break;









		mutex_unlock(&svmm->mutex);



















		folio_unlock(folio);









		folio_put(folio);









	}



















	/* Map the page on the GPU. */








@@ -637,8 +642,8 @@ static int nouveau_atomic_range_fault(struct nouveau_svmm *svmm,







	ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, size, NULL);









	mutex_unlock(&svmm->mutex);



















	unlock_page(page);









	put_page(page);









	folio_unlock(folio);









	folio_put(folio);



















out:









	mmu_interval_notifier_remove(&notifier->notifier);
































drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -75,7 +75,7 @@ gp10b_pmu_acr = {







	.bootstrap_multiple_falcons = gp10b_pmu_acr_bootstrap_multiple_falcons,









};



















#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)









#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)









MODULE_FIRMWARE("nvidia/gp10b/pmu/desc.bin");









MODULE_FIRMWARE("nvidia/gp10b/pmu/image.bin");









MODULE_FIRMWARE("nvidia/gp10b/pmu/sig.bin");
































drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -109,13 +109,13 @@ static int jadard_prepare(struct drm_panel *panel)







	if (jadard->desc->lp11_to_reset_delay_ms)









		msleep(jadard->desc->lp11_to_reset_delay_ms);



















	gpiod_set_value(jadard->reset, 1);









	gpiod_set_value(jadard->reset, 0);









	msleep(5);



















	gpiod_set_value(jadard->reset, 0);









	gpiod_set_value(jadard->reset, 1);









	msleep(10);



















	gpiod_set_value(jadard->reset, 1);









	gpiod_set_value(jadard->reset, 0);









	msleep(130);



















	ret = jadard->desc->init(jadard);








@@ -1130,7 +1130,7 @@ static int jadard_dsi_probe(struct mipi_dsi_device *dsi)







	dsi->format = desc->format;









	dsi->lanes = desc->lanes;



















	jadard->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);









	jadard->reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);









	if (IS_ERR(jadard->reset)) {









		DRM_DEV_ERROR(&dsi->dev, "failed to get our reset GPIO\n");









		return PTR_ERR(jadard->reset);