Commit 690e516e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-09-12' of... 

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

 into drm-fixes

An off-by-one fix for the CMA DMA-buf heap, An init fix for nouveau, a
config dependency fix for stm, a syncobj leak fix, and two iommu fixes
for tegra and rockchip.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240912-phenomenal-upbeat-grouse-a26781@houat
parents bb7e19bd 45c690ae

drivers/dma-buf/heaps/cma_heap.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static vm_fault_t cma_heap_vm_fault(struct vm_fault *vmf) 
	struct vm_area_struct *vma = vmf->vma;

	struct cma_heap_buffer *buffer = vma->vm_private_data;



	if (vmf->pgoff > buffer->pagecount)

	if (vmf->pgoff >= buffer->pagecount)

		return VM_FAULT_SIGBUS;



	return vmf_insert_pfn(vma, vmf->address, page_to_pfn(buffer->pages[vmf->pgoff]));

drivers/gpu/drm/drm_syncobj.c

+13 −4
Original line number Diff line number Diff line
@@ -1464,6 +1464,7 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data, 
	struct drm_syncobj *syncobj;

	struct eventfd_ctx *ev_fd_ctx;

	struct syncobj_eventfd_entry *entry;

	int ret;



	if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE))

		return -EOPNOTSUPP;
@@ -1479,13 +1480,15 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data, 
		return -ENOENT;



	ev_fd_ctx = eventfd_ctx_fdget(args->fd);

	if (IS_ERR(ev_fd_ctx))

		return PTR_ERR(ev_fd_ctx);

	if (IS_ERR(ev_fd_ctx)) {

		ret = PTR_ERR(ev_fd_ctx);

		goto err_fdget;

	}



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

	if (!entry) {

		eventfd_ctx_put(ev_fd_ctx);

		return -ENOMEM;

		ret = -ENOMEM;

		goto err_kzalloc;

	}

	entry->syncobj = syncobj;

	entry->ev_fd_ctx = ev_fd_ctx;
@@ -1496,6 +1499,12 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data, 
	drm_syncobj_put(syncobj);



	return 0;



err_kzalloc:

	eventfd_ctx_put(ev_fd_ctx);

err_fdget:

	drm_syncobj_put(syncobj);

	return ret;

}



int

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ u32 gm107_ram_probe_fbp(const struct nvkm_ram_func *, 
u32 gm200_ram_probe_fbp_amount(const struct nvkm_ram_func *, u32,

			       struct nvkm_device *, int, int *);



int gp100_ram_init(struct nvkm_ram *);



/* RAM type-specific MR calculation routines */

int nvkm_sddr2_calc(struct nvkm_ram *);

int nvkm_sddr3_calc(struct nvkm_ram *);

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <subdev/bios/init.h>

#include <subdev/bios/rammap.h>



static int

int

gp100_ram_init(struct nvkm_ram *ram)

{

	struct nvkm_subdev *subdev = &ram->fb->subdev;

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


static const struct nvkm_ram_func

gp102_ram = {

	.init = gp100_ram_init,

};



int