Commit c59c7588 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm 

Pull more drm updates from Daniel Vetter:
 "UAPI Changes:

   - Only enable char/agp uapi when CONFIG_DRM_LEGACY is set

  Cross-subsystem Changes:

   - vma_set_file helper to make vma->vm_file changing less brittle,
     acked by Andrew

  Core Changes:

   - dma-buf heaps improvements

   - pass full atomic modeset state to driver callbacks

   - shmem helpers: cached bo by default

   - cleanups for fbdev, fb-helpers

   - better docs for drm modes and SCALING_FITLER uapi

   - ttm: fix dma32 page pool regression

  Driver Changes:

   - multi-hop regression fixes for amdgpu, radeon, nouveau

   - lots of small amdgpu hw enabling fixes (display, pm, ...)

   - fixes for imx, mcde, meson, some panels, virtio, qxl, i915, all
     fairly minor

   - some cleanups for legacy drm/fbdev drivers"

* tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm: (117 commits)
  drm/qxl: don't allocate a dma_address array
  drm/nouveau: fix multihop when move doesn't work.
  drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping
  drm/i915: Fix mismatch between misplaced vma check and vma insert
  drm/i915/perf: also include Gen11 in OATAILPTR workaround
  Revert "drm/i915: re-order if/else ladder for hpd_irq_setup"
  drm/amdgpu/disply: fix documentation warnings in display manager
  drm/amdgpu: print mmhub client name for dimgrey_cavefish
  drm/amdgpu: set mode1 reset as default for dimgrey_cavefish
  drm/amd/display: Add get_dig_frontend implementation for DCEx
  drm/radeon: remove h from printk format specifier
  drm/amdgpu: remove h from printk format specifier
  drm/amdgpu: Fix spelling mistake "Heterogenous" -> "Heterogeneous"
  drm/amdgpu: fix regression in vbios reservation handling on headless
  drm/amdgpu/SRIOV: Extend VF reset request wait period
  drm/amdkfd: correct amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu log.
  drm/amd/display: Adding prototype for dccg21_update_dpp_dto()
  drm/amdgpu: print what method we are using for runtime pm
  drm/amdgpu: simplify logic in atpx resume handling
  drm/amdgpu: no need to call pci_ignore_hotplug for _PR3
  ...
parents 432c19a8 4efd7fab

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

Documentation/driver-api/dma-buf.rst

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ DMA Fence uABI/Sync File 
Indefinite DMA Fences

~~~~~~~~~~~~~~~~~~~~~



At various times &dma_fence with an indefinite time until dma_fence_wait()

At various times struct dma_fence with an indefinite time until dma_fence_wait()

finishes have been proposed. Examples include:



* Future fences, used in HWC1 to signal when a buffer isn't used by the display

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);