Commit 419d8a93 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-02-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A quiet week: one fix for CMA dma-buf pages accounting, and one to
virtio to set the segment size of the virtio_gpu device.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/obnofpccz73c3uiqfyipxmjta5fgm4cle55dmtnissgtgxfgv7@22o7kb62efri
parents 41bccc98 1c1914d6

drivers/dma-buf/heaps/cma_heap.c

+3 −4
Original line number Diff line number Diff line
@@ -168,10 +168,7 @@ static vm_fault_t cma_heap_vm_fault(struct vm_fault *vmf) 
	if (vmf->pgoff > buffer->pagecount)

		return VM_FAULT_SIGBUS;



	vmf->page = buffer->pages[vmf->pgoff];

	get_page(vmf->page);



	return 0;

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

}



static const struct vm_operations_struct dma_heap_vm_ops = {
@@ -185,6 +182,8 @@ static int cma_heap_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) 
	if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0)

		return -EINVAL;



	vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);



	vma->vm_ops = &dma_heap_vm_ops;

	vma->vm_private_data = buffer;

drivers/gpu/drm/virtio/virtgpu_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static int virtio_gpu_probe(struct virtio_device *vdev) 
			goto err_free;

	}



	dma_set_max_seg_size(dev->dev, dma_max_mapping_size(dev->dev) ?: UINT_MAX);

	ret = virtio_gpu_init(vdev, dev);

	if (ret)

		goto err_free;