Commit 5fbd41d3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2020-11-27-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.11:

UAPI Changes:

Cross-subsystem Changes:

 * char/agp: Disable frontend without CONFIG_DRM_LEGACY
 * mm: Fix fput in mmap error path; Introduce vma_set_file() to change
   vma->vm_file

Core Changes:

 * dma-buf: Use sgtables in system heap; Move heap helpers to CMA-heap code;
   Skip sync for unmapped buffers; Alloc higher order pages is available;
   Respect num_fences when initializing shared fence list
 * doc: Improvements around DRM modes and SCALING_FILTER
 * Pass full state to connector atomic functions + callee updates
 * Cleanups
 * shmem: Map pages with caching by default; Cleanups
 * ttm: Fix DMA32 for global page pool
 * fbdev: Cleanups
 * fb-helper: Update framebuffer after userspace writes; Unmap console buffer
   during shutdown; Rework damage handling of shadow framebuffer

Driver Changes:

 * amdgpu: Multi-hop fixes, Clenaups
 * imx: Fix rotation for Vivante tiled formats; Support nearest-neighour
   skaling; Cleanups
 * mcde: Fix RGB formats; Support DPI output; Cleanups
 * meson: HDMI clock fixes
 * panel: Add driver and bindings for Innolux N125HCE-GN1
 * panel/s6e63m0: More backlight levels; Fix init; Cleanups
 * via: Clenunps
 * virtio: Use fence ID for handling fences; Cleanups

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201127083055.GA29139@linux-uq9g
parents 1d36dffa 05faf155

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ properties: 
      - innolux,g121x1-l03

        # Innolux Corporation 11.6" WXGA (1366x768) TFT LCD panel

      - innolux,n116bge

        # InnoLux 13.3" FHD (1920x1080) eDP TFT LCD panel

      - innolux,n125hce-gn1

        # InnoLux 15.6" WXGA TFT LCD panel

      - innolux,n156bge-l21

        # Innolux Corporation 7.0" WSVGA (1024x600) TFT LCD panel

drivers/char/agp/Makefile

+5 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

agpgart-y := backend.o frontend.o generic.o isoch.o

agpgart-y := backend.o generic.o isoch.o



ifeq ($(CONFIG_DRM_LEGACY),y)

agpgart-$(CONFIG_COMPAT)	+= compat_ioctl.o

agpgart-y			+= frontend.o

endif





obj-$(CONFIG_AGP)		+= agpgart.o

obj-$(CONFIG_AGP_ALI)		+= ali-agp.o

drivers/char/agp/agp.h

+5 −0
Original line number Diff line number Diff line
@@ -186,8 +186,13 @@ int agp_add_bridge(struct agp_bridge_data *bridge); 
void agp_remove_bridge(struct agp_bridge_data *bridge);



/* Frontend routines. */

#if IS_ENABLED(CONFIG_DRM_LEGACY)

int agp_frontend_initialize(void);

void agp_frontend_cleanup(void);

#else

static inline int agp_frontend_initialize(void) { return 0; }

static inline void agp_frontend_cleanup(void) {}

#endif



/* Generic routines. */

void agp_generic_enable(struct agp_bridge_data *bridge, u32 mode);

drivers/dma-buf/dma-buf.c

+2 −17
Original line number Diff line number Diff line
@@ -1166,9 +1166,6 @@ EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access); 
int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,

		 unsigned long pgoff)

{

	struct file *oldfile;

	int ret;



	if (WARN_ON(!dmabuf || !vma))

		return -EINVAL;
@@ -1186,22 +1183,10 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, 
		return -EINVAL;



	/* readjust the vma */

	get_file(dmabuf->file);

	oldfile = vma->vm_file;

	vma->vm_file = dmabuf->file;

	vma_set_file(vma, dmabuf->file);

	vma->vm_pgoff = pgoff;



	ret = dmabuf->ops->mmap(dmabuf, vma);

	if (ret) {

		/* restore old parameters on failure */

		vma->vm_file = oldfile;

		fput(dmabuf->file);

	} else {

		if (oldfile)

			fput(oldfile);

	}

	return ret;



	return dmabuf->ops->mmap(dmabuf, vma);

}

EXPORT_SYMBOL_GPL(dma_buf_mmap);

drivers/dma-buf/dma-resv.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences) 
			max = max(old->shared_count + num_fences,

				  old->shared_max * 2);

	} else {

		max = 4;

		max = max(4ul, roundup_pow_of_two(num_fences));

	}



	new = dma_resv_list_alloc(max);

CRA Git | Maintained and supported by SUSTech CRA and CCSE