Commit 7ed09360 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2019-10-09-2' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.5:

UAPI Changes:
-Colorspace: Expose different prop values for DP vs. HDMI (Gwan-gyeong Mun)
-fourcc: Add DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED (Raymond)
-not_actually: s/ENOTSUPP/EOPNOTSUPP/ in drm_edid and drm_mipi_dbi. This should
    not reach userspace, but adding here to specifically call that out (Daniel)
-i810: Prevent underflow in dispatch ioctls (Dan)
-komeda: Add ACLK sysfs attribute (Mihail)
-v3d: Allow userspace to clean up after render jobs (Iago)

Cross-subsystem Changes:
-MAINTAINERS:
 -Add Alyssa & Steven as panfrost reviewers (Rob)
 -Add Jernej as DE2 reviewer (Maxime)
 -Add Chen-Yu as Allwinner maintainer (Maxime)
-staging: Make some stack arrays static const (Colin)

Core Changes:
-ttm: Allow drivers to specify their vma manager (to use gem mgr) (Gerd)
-docs: Various fixes in connector/encoder/bridge docs (Daniel, Lyude, Laurent)
-connector: Allow more than 3 possible encoders for a connector (José)
-dp_cec: Allow a connector to be associated with a cec device (Dariusz)
-various: Fix some compile/sparse warnings (Ville)
-mm: Ensure mm node removals are properly serialised (Chris)
-panel: Specify the type of panel for drm_panels for later use (Laurent)
-panel: Use drm_panel_init to init device and funcs (Laurent)
-mst: Refactors and cleanups in anticipation of suspend/resume support (Lyude)
-vram:
 -Add lazy unmapping for gem bo's (Thomas)
 -Unify and rationalize vram mm and gem vram (Thomas)
 -Expose vmap and vunmap for gem vram objects (Thomas)
 -Allow objects to be pinned at the top of vram to avoid fragmentation (Thomas)

Driver Changes:
-various: Include drm_bridge.h instead of relying on drm_crtc.h (Boris)
-ast/mgag200: Refactor show_cursor(), move cursor to top of video mem (Thomas)
-komeda:
 -Add error event printing (behind CONFIG) and reg dump support (Lowry)
 -Add suspend/resume support (Lowry)
 -Workaround D71 shadow registers not flushing on disable (Lowry)
-meson: Add suspend/resume support (Neil)
-omap: Miscellaneous refactors and improvements (Tomi/Jyri)
-panfrost/shmem: Silence lockdep by using mutex_trylock (Rob)
-panfrost: Miscellaneous small fixes (Rob/Steven)
-sti: Fix warnings (Benjamin/Linus)
-sun4i:
 -Add vcc-dsi regulator to sun6i_mipi_dsi (Jagan)
 -A few patches to figure out the DRQ/start delay calc on dsi (Jagan/Icenowy)
-virtio:
 -Add module param to switch resource reuse workaround on/off (Gerd)
 -Avoid calling vmexit while holding spinlock (Gerd)
 -Use gem shmem helpers instead of ttm (Gerd)
 -Accommodate command buffer allocations too big for cma (David)

Cc: Rob Herring <robh@kernel.org>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Dariusz Marcinkiewicz <darekm@google.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Raymond Smith <raymond.smith@arm.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mihail Atanassov <Mihail.Atanassov@arm.com>
Cc: Lowry Li <Lowry.Li@arm.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Cc: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Iago Toral Quiroga <itoral@igalia.com>
Cc: David Riley <davidriley@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# gpg: Signature made Thu 10 Oct 2019 01:00:47 AM AEST
# gpg:                using RSA key 732C002572DCAF79
# gpg: Can't check signature: public key not found

# Conflicts:
#	drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
#	drivers/gpu/drm/i915/i915_drv.c
#	drivers/gpu/drm/i915/i915_gem.c
#	drivers/gpu/drm/i915/i915_gem_gtt.c
#	drivers/gpu/drm/i915/i915_vma.c
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191009150825.GA227673@art_vandelay
parents 97ea5654 354c2d31

Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ properties: 
  resets:

    maxItems: 1



  vcc-dsi-supply:

    description: VCC-DSI power supply of the DSI encoder



  phys:

    maxItems: 1
@@ -64,6 +67,7 @@ required: 
  - phys

  - phy-names

  - resets

  - vcc-dsi-supply

  - port



additionalProperties: false
@@ -79,6 +83,7 @@ examples: 
        resets = <&ccu 4>;

        phys = <&dphy0>;

        phy-names = "dphy";

        vcc-dsi-supply = <&reg_dcdc1>;

        #address-cells = <1>;

        #size-cells = <0>;

Documentation/devicetree/bindings/display/bridge/anx7814.txt

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,11 @@ designed for portable devices. 


Required properties:



 - compatible		: "analogix,anx7814"

 - compatible		: Must be one of:

			  "analogix,anx7808"

			  "analogix,anx7812"

			  "analogix,anx7814"

			  "analogix,anx7818"

 - reg			: I2C address of the device

 - interrupts		: Should contain the INTP interrupt

 - hpd-gpios		: Which GPIO to use for hpd

Documentation/gpu/drm-mm.rst

+4 −7
Original line number Diff line number Diff line
@@ -400,16 +400,13 @@ GEM VRAM Helper Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c

   :export:



VRAM MM Helper Functions Reference

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

GEM TTM Helper Functions Reference

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



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

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

   :doc: overview



.. kernel-doc:: include/drm/drm_vram_mm_helper.h

   :internal:



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

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

   :export:



VMA Offset Manager

Documentation/gpu/mcde.rst

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
=======================================================



.. kernel-doc:: drivers/gpu/drm/mcde/mcde_drv.c

   :doc: ST-Ericsson MCDE DRM Driver
 
   :doc: ST-Ericsson MCDE Driver

Documentation/gpu/todo.rst

+12 −0
Original line number Diff line number Diff line
@@ -284,6 +284,18 @@ drm_fb_helper tasks 
  removed: drm_fb_helper_single_add_all_connectors(),

  drm_fb_helper_add_one_connector() and drm_fb_helper_remove_one_connector().



connector register/unregister fixes

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



- For most connectors it's a no-op to call drm_connector_register/unregister

  directly from driver code, drm_dev_register/unregister take care of this

  already. We can remove all of them.



- For dp drivers it's a bit more a mess, since we need the connector to be

  registered when calling drm_dp_aux_register. Fix this by instead calling

  drm_dp_aux_init, and moving the actual registering into a late_register

  callback as recommended in the kerneldoc.



Core refactorings

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE