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

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



drm-misc-next for 5.7

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - bridge: huge rework to get rid of omap_dss custom display drivers

Driver Changes:
  - hisilicon: some fixes related to modes it can deal with / default to
  - virtio: shmem and gpu context fixes and enhancements
  - sun4i: Support for LVDS on the A33

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227113222.cdwzy4cvcqjtbmou@gilmour.lan
parents a2ae604d 18b39fb9

Documentation/gpu/drm-kms-helpers.rst

+15 −3
Original line number Diff line number Diff line
@@ -139,11 +139,17 @@ Overview 
.. kernel-doc:: drivers/gpu/drm/drm_bridge.c

   :doc: overview



Default bridge callback sequence

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

Bridge Operations

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



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

   :doc: bridge callbacks

   :doc: bridge operations



Bridge Connector Helper

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



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

   :doc: overview





Bridge Helper Reference
@@ -155,6 +161,12 @@ Bridge Helper Reference 
.. kernel-doc:: drivers/gpu/drm/drm_bridge.c

   :export:



Bridge Connector Helper Reference

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



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

   :export:



Panel-Bridge Helper Reference

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

Documentation/gpu/todo.rst

+14 −0
Original line number Diff line number Diff line
@@ -407,6 +407,20 @@ Contact: Daniel Vetter 


Level: Intermediate



Replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi

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



Once EDID is parsed, the monitor HDMI support information is available through

drm_display_info.is_hdmi. Many drivers still call drm_detect_hdmi_monitor() to

retrieve the same information, which is less efficient.



Audit each individual driver calling drm_detect_hdmi_monitor() and switch to

drm_display_info.is_hdmi if applicable.



Contact: Laurent Pinchart, respective driver maintainers



Level: Intermediate



Core refactorings

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

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -5600,12 +5600,13 @@ S: Maintained 
F:	drivers/gpu/drm/gma500/









DRM DRIVERS FOR HISILICON









M:	Xinliang Liu <z.liuxinliang@hisilicon.com>









M:	Xinliang Liu <xinliang.liu@linaro.org>









M:	Rongrong Zou <zourongrong@gmail.com>









R:	John Stultz <john.stultz@linaro.org>









R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>









R:	Chen Feng <puck.chen@hisilicon.com>









L:	dri-devel@lists.freedesktop.org









T:	git git://github.com/xin3liang/linux.git









T:	git git://anongit.freedesktop.org/drm/drm-misc









S:	Maintained









F:	drivers/gpu/drm/hisilicon/









F:	Documentation/devicetree/bindings/display/hisilicon/
































arch/arm/configs/davinci_all_defconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -158,7 +158,7 @@ CONFIG_VIDEO_TVP514X=m







CONFIG_VIDEO_ADV7343=m









CONFIG_DRM=m









CONFIG_DRM_TILCDC=m









CONFIG_DRM_DUMB_VGA_DAC=m









CONFIG_DRM_SIMPLE_BRIDGE=m









CONFIG_DRM_TINYDRM=m









CONFIG_TINYDRM_ST7586=m









CONFIG_FB=y
































arch/arm/configs/integrator_defconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -55,7 +55,7 @@ CONFIG_SMC91X=y







# CONFIG_KEYBOARD_ATKBD is not set









# CONFIG_SERIO_SERPORT is not set









CONFIG_DRM=y









CONFIG_DRM_DUMB_VGA_DAC=y









CONFIG_DRM_SIMPLE_BRIDGE=y









CONFIG_DRM_PL111=y









CONFIG_FB_MODE_HELPERS=y









CONFIG_FB_MATROX=y