Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c379b4f authored by Dave Airlie's avatar Dave Airlie
Browse files

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

UAPI Changes:

- Add "panel orientation" property to DRM to indicate orientation of the
panel vs the device's casing (Hans de Goede)

Core Changes:

- misc doc and bug fixes

Driver Changes:

- sun4i: Many improvements to the DE driver like multi-plane support and
YUV formats (Jernej Skrabec)

* tag 'drm-misc-next-2017-12-07' of git://anongit.freedesktop.org/drm/drm-misc: (50 commits)
  drm/sun4i: Fix uninitialized variables in vi layer
  drm/fb-helper: Fix potential NULL pointer dereference
  gpu: drm: stm: Adopt SPDX identifiers
  gpu: drm: sti: Adopt SPDX identifiers
  drm/fsl-dcu: Use drm_mode_config_helper_suspend/resume()
  drm/sun4i: Wire in DE2 YUV support
  drm/sun4i: Expand DE2 scaler lib with YUV support
  drm/sun4i: Add DE2 definitions for YUV formats
  drm/sun4i: Add DE2 CSC library
  drm/sun4i: Add CCSC property to DE2 configuration
  drm/sun4i: Add support for HW scaling to DE2
  drm/sun4i: Add scaler configuration to DE2 mixers
  drm/sun4i: Add support for DE2 VI planes
  drm/sun4i: Reorganize UI layer code in DE2
  drm/sun4i: Add support for all HW supported DE2 RGB formats
  drm/sun4i: Add multi plane support to DE2 driver
  drm/sun4i: Move interlace related code in DE2
  drm/sun4i: Move channel size related code in DE2
  drm/sun4i: Move line width setting in DE2
  drm/sun4i: Use values calculated by atomic check
  ...
parents 9c606cd4 bc29489f

Documentation/devicetree/bindings/display/ilitek,ili9225.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Ilitek ILI9225 display panels



This binding is for display panels using an Ilitek ILI9225 controller in SPI

mode.



Required properties:

- compatible:	"ilitek,ili9225-2.2in-176x220"

- rs-gpios:	Register select signal

- reset-gpios:	Reset pin



The node for this driver must be a child node of a SPI controller, hence

all mandatory properties described in ../spi/spi-bus.txt must be specified.



Optional properties:

- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)



Example:

	display@0{

		compatible = "ilitek,ili9225-2.2in-176x220";

		reg = <0>;

		spi-max-frequency = <12000000>;

		rs-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;

		rotation = <270>;

	};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ i2se I2SE GmbH 
ibm	International Business Machines (IBM)

idt	Integrated Device Technologies, Inc.

ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)

ilitek	ILI Technology Corporation (ILITEK)

img	Imagination Technologies Ltd.

infineon Infineon Technologies

inforce	Inforce Computing

Documentation/gpu/drm-kms-helpers.rst

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ Panel Helper Reference 
.. kernel-doc:: drivers/gpu/drm/drm_panel.c

   :export:



.. kernel-doc:: drivers/gpu/drm/drm_panel_orientation_quirks.c

   :export:



Display Port Helper Functions Reference

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

Documentation/gpu/todo.rst

+9 −5
Original line number Diff line number Diff line
@@ -185,6 +185,15 @@ are better. 


Contact: Sean Paul, Maintainer of the driver you plan to convert



Convert drivers to use simple modeset suspend/resume

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



Most drivers (except i915 and nouveau) that use

drm_atomic_helper_suspend/resume() can probably be converted to use

drm_mode_config_helper_suspend/resume().



Contact: Maintainer of the driver you plan to convert



Core refactorings

=================
@@ -404,11 +413,6 @@ those drivers as simple as possible, so lots of room for refactoring: 
  a drm_device wrong. Doesn't matter, since everyone else gets it wrong

  too :-)



- With the fbdev pointer in dev->mode_config we could also make

  suspend/resume helpers entirely generic, at least if we add a

  dev->mode_config.suspend_state. We could even provide a generic pm_ops

  structure with those.



- also rework the drm_framebuffer_funcs->dirty hook wire-up, see above.



Contact: Noralf Trønnes, Daniel Vetter

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4461,6 +4461,12 @@ T: git git://anongit.freedesktop.org/drm/drm-misc 
S:	Maintained

F:	drivers/gpu/drm/tve200/



DRM DRIVER FOR ILITEK ILI9225 PANELS

M:	David Lechner <david@lechnology.com>

S:	Maintained

F:	drivers/gpu/drm/tinydrm/ili9225.c

F:	Documentation/devicetree/bindings/display/ili9225.txt



DRM DRIVER FOR INTEL I810 VIDEO CARDS

S:	Orphan / Obsolete

F:	drivers/gpu/drm/i810/