Commit fef1aa48 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 

Final drm-misc feature pull for 4.15:

UAPI Changes:
- new madvise ioctl for vc4 (Boris)

Core Changes:
- plane commit tracking fixes (Maarten)
- vgaarb improvements for fancy new platforms (aka ppc64 and arm64) by
  Bjorn Helgaas

Driver Changes:
- pile of new panel drivers: Toshiba LT089AC19000, Innolux AT043TN24
- more sun4i work to support A10/A20 Tcon and hdmi outputs
- vc4: fix sleep in irq handler by making it threaded (Eric)
- udl probe/edid read fixes (Robert Tarasov)

And a bunch of misc small cleanups/refactors and doc fixes all over.

* tag 'drm-misc-next-2017-10-20' of git://anongit.freedesktop.org/drm/drm-misc: (32 commits)
  drm/vc4: Fix sleeps during the IRQ handler for DSI transactions.
  drm/vc4: Add the DRM_IOCTL_VC4_GEM_MADVISE ioctl
  drm/panel: simple: add Toshiba LT089AC19000
  dma-fence: remove duplicate word in comment
  drm/panel: simple: add delays for Innolux AT043TN24
  drm/panel: simple: add bus flags for Innolux AT043TN24
  drm/panel: simple: fix vertical timings for Innolux AT043TN24
  drm/atomic-helper: check that drivers call drm_crtc_vblank_off
  drm: some KMS todo ideas
  vgaarb: Factor out EFI and fallback default device selection
  vgaarb: Select a default VGA device even if there's no legacy VGA
  drm/bridge: adv7511: Fix a use after free
  drm/sun4i: Add support for A20 display pipeline components
  drm/sun4i: Add support for A10 display pipeline components
  drm/sun4i: hdmi: Support HDMI controller on A10
  drm/sun4i: tcon: Add support for A10 TCON
  drm/sun4i: backend: Support output muxing
  drm/sun4i: tcon: Move out the tcon0 common setup
  drm/sun4i: tcon: Don't rely on encoders to set the TCON mode
  drm/sun4i: tcon: Don't rely on encoders to enable the TCON
  ...
parents 3b677e43 af0c8c10

Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Toshiba 8.9" WXGA (1280x768) TFT LCD panel



Required properties:

- compatible: should be "toshiba,lt089ac29000.txt"

- power-supply: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ CEC. It is one end of the pipeline. 


Required properties:

  - compatible: value must be one of:

    * allwinner,sun4i-a10-hdmi

    * allwinner,sun5i-a10s-hdmi

    * allwinner,sun6i-a31-hdmi

  - reg: base address and size of memory-mapped region
@@ -86,9 +87,11 @@ The TCON acts as a timing controller for RGB, LVDS and TV interfaces. 


Required properties:

 - compatible: value must be either:

   * allwinner,sun4i-a10-tcon

   * allwinner,sun5i-a13-tcon

   * allwinner,sun6i-a31-tcon

   * allwinner,sun6i-a31s-tcon

   * allwinner,sun7i-a20-tcon

   * allwinner,sun8i-a33-tcon

   * allwinner,sun8i-v3s-tcon

 - reg: base address and size of memory-mapped region
@@ -153,8 +156,10 @@ system. 


Required properties:

  - compatible: value must be one of:

    * allwinner,sun4i-a10-display-backend

    * allwinner,sun5i-a13-display-backend

    * allwinner,sun6i-a31-display-backend

    * allwinner,sun7i-a20-display-backend

    * allwinner,sun8i-a33-display-backend

  - reg: base address and size of the memory-mapped region.

  - interrupts: interrupt associated to this IP
@@ -185,8 +190,10 @@ deinterlacing and color space conversion. 


Required properties:

  - compatible: value must be one of:

    * allwinner,sun4i-a10-display-frontend

    * allwinner,sun5i-a13-display-frontend

    * allwinner,sun6i-a31-display-frontend

    * allwinner,sun7i-a20-display-frontend

    * allwinner,sun8i-a33-display-frontend

  - reg: base address and size of the memory-mapped region.

  - interrupts: interrupt associated to this IP
@@ -231,10 +238,12 @@ extra node. 


Required properties:

  - compatible: value must be one of:

    * allwinner,sun4i-a10-display-engine

    * allwinner,sun5i-a10s-display-engine

    * allwinner,sun5i-a13-display-engine

    * allwinner,sun6i-a31-display-engine

    * allwinner,sun6i-a31s-display-engine

    * allwinner,sun7i-a20-display-engine

    * allwinner,sun8i-a33-display-engine

    * allwinner,sun8i-v3s-display-engine

Documentation/gpu/todo.rst

+12 −0
Original line number Diff line number Diff line
@@ -304,6 +304,18 @@ There's a bunch of issues with it: 


Contact: Daniel Vetter



KMS cleanups

------------



Some of these date from the very introduction of KMS in 2008 ...



- drm_mode_config.crtc_idr is misnamed, since it contains all KMS object. Should

  be renamed to drm_mode_config.object_idr.



- drm_display_mode doesn't need to be derived from drm_mode_object. That's

  leftovers from older (never merged into upstream) KMS designs where modes

  where set using their ID, including support to add/remove modes.



Better Testing

==============

arch/powerpc/kernel/pci-common.c

+0 −12
Original line number Diff line number Diff line
@@ -1740,15 +1740,3 @@ static void fixup_hide_host_resource_fsl(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl);
 


static void fixup_vga(struct pci_dev *pdev)

{

	u16 cmd;



	pci_read_config_word(pdev, PCI_COMMAND, &cmd);

	if ((cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) || !vga_default_device())

		vga_set_default_device(pdev);



}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,

			      PCI_CLASS_DISPLAY_VGA, 8, fixup_vga);

drivers/gpu/drm/armada/armada_crtc.c

+11 −11
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc, 


	if (force) {

		/* Display is disabled, so just drop the old fb */

		drm_framebuffer_unreference(fb);

		drm_framebuffer_put(fb);

		return;

	}
@@ -321,7 +321,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc, 
	 * the best.  The worst that will happen is the buffer gets

	 * reused before it has finished being displayed.

	 */

	drm_framebuffer_unreference(fb);

	drm_framebuffer_put(fb);

}



static void armada_drm_vblank_off(struct armada_crtc *dcrtc)
@@ -577,7 +577,7 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, 
	unsigned i;

	bool interlaced;



	drm_framebuffer_reference(crtc->primary->fb);

	drm_framebuffer_get(crtc->primary->fb);



	interlaced = !!(adj->flags & DRM_MODE_FLAG_INTERLACE);
@@ -718,7 +718,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
				   MAX_SCHEDULE_TIMEOUT);



	/* Take a reference to the new fb as we're using it */

	drm_framebuffer_reference(crtc->primary->fb);

	drm_framebuffer_get(crtc->primary->fb);



	/* Update the base in the CRTC */

	armada_drm_crtc_update_regs(dcrtc, regs);
@@ -742,7 +742,7 @@ void armada_drm_crtc_plane_disable(struct armada_crtc *dcrtc, 
	 * primary plane.

	 */

	if (plane->fb)

		drm_framebuffer_unreference(plane->fb);

		drm_framebuffer_put(plane->fb);



	/* Power down the Y/U/V FIFOs */

	sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66;
@@ -947,13 +947,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc, 


		/* Must be a kernel-mapped object */

		if (!obj->addr) {

			drm_gem_object_unreference_unlocked(&obj->obj);

			drm_gem_object_put_unlocked(&obj->obj);

			return -EINVAL;

		}



		if (obj->obj.size < w * h * 4) {

			DRM_ERROR("buffer is too small\n");

			drm_gem_object_unreference_unlocked(&obj->obj);

			drm_gem_object_put_unlocked(&obj->obj);

			return -ENOMEM;

		}

	}
@@ -961,7 +961,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc, 
	if (dcrtc->cursor_obj) {

		dcrtc->cursor_obj->update = NULL;

		dcrtc->cursor_obj->update_data = NULL;

		drm_gem_object_unreference_unlocked(&dcrtc->cursor_obj->obj);

		drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);

	}

	dcrtc->cursor_obj = obj;

	dcrtc->cursor_w = w;
@@ -997,7 +997,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) 
	struct armada_private *priv = crtc->dev->dev_private;



	if (dcrtc->cursor_obj)

		drm_gem_object_unreference_unlocked(&dcrtc->cursor_obj->obj);

		drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);



	priv->dcrtc[dcrtc->num] = NULL;

	drm_crtc_cleanup(&dcrtc->crtc);
@@ -1045,12 +1045,12 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, 
	 * Ensure that we hold a reference on the new framebuffer.

	 * This has to match the behaviour in mode_set.

	 */

	drm_framebuffer_reference(fb);

	drm_framebuffer_get(fb);



	ret = armada_drm_crtc_queue_frame_work(dcrtc, work);

	if (ret) {

		/* Undo our reference above */

		drm_framebuffer_unreference(fb);

		drm_framebuffer_put(fb);

		kfree(work);

		return ret;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE