Commit cb3cfbf7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2021-01-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.12:

Core Changes:
- Lots of drm documentation updates by Simor Ser.
- Require that each crtc has a unique primary plane.
- Add fixme that fbdev_generic_setup is confusing.

Driver Changes:
- Update addresses for TI display drivers maintainers.
- Make DRM_VIRTIO_GPU select VIRTIO.
- Small fixes to qxl, virtio, hisilicon, tve200, panel/s6e63m0.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fdfbfd7a-b91d-3f59-11c8-984704ce0ee1@linux.intel.com
parents 73dc923e cf9a4be4

Documentation/gpu/drm-kms.rst

+35 −17
Original line number Diff line number Diff line
@@ -319,6 +319,15 @@ CRTC Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_crtc.c

   :export:



Color Management Functions Reference

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



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

   :export:



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

   :internal:



Frame Buffer Abstraction

========================
@@ -370,6 +379,21 @@ Plane Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_plane.c

   :export:



Plane Composition Functions Reference

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



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

   :export:



Plane Damage Tracking Functions Reference

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



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

   :export:



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

   :internal:



Display Modes Function Reference

================================
@@ -436,6 +460,9 @@ KMS Locking 
KMS Properties

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



This section of the documentation is primarily aimed at user-space developers.

For the driver APIs, see the other sections.



Property Types and Blob Property Support

----------------------------------------
@@ -466,39 +493,30 @@ Standard CRTC Properties 
.. kernel-doc:: drivers/gpu/drm/drm_crtc.c

   :doc: standard CRTC properties



Standard Plane Properties

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



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

   :doc: standard plane properties



Plane Composition Properties

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



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

   :doc: overview



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

   :export:



FB_DAMAGE_CLIPS

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

Damage Tracking Properties

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



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

   :doc: overview



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

   :export:



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

   :internal:



Color Management Properties

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



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

   :doc: overview



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

   :export:



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

   :internal:



Tile Group Property

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

Documentation/gpu/drm-uapi.rst

+3 −0
Original line number Diff line number Diff line
@@ -457,5 +457,8 @@ Userspace API Structures 
.. kernel-doc:: include/uapi/drm/drm_mode.h

   :doc: overview



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

   :internal:



.. kernel-doc:: include/uapi/drm/drm_mode.h

   :internal:

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -5985,8 +5985,8 @@ F: Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml 
F:	drivers/gpu/drm/stm









DRM DRIVERS FOR TI KEYSTONE









M:	Jyri Sarha <jsarha@ti.com>









M:	Tomi Valkeinen <tomi.valkeinen@ti.com>









M:	Jyri Sarha <jyri.sarha@iki.fi>









M:	Tomi Valkeinen <tomba@kernel.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









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








@@ -5996,15 +5996,15 @@ F:	Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml







F:	drivers/gpu/drm/tidss/

















DRM DRIVERS FOR TI LCDC









M:	Jyri Sarha <jsarha@ti.com>









R:	Tomi Valkeinen <tomi.valkeinen@ti.com>









M:	Jyri Sarha <jyri.sarha@iki.fi>









R:	Tomi Valkeinen <tomba@kernel.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









F:	Documentation/devicetree/bindings/display/tilcdc/









F:	drivers/gpu/drm/tilcdc/

















DRM DRIVERS FOR TI OMAP









M:	Tomi Valkeinen <tomi.valkeinen@ti.com>









M:	Tomi Valkeinen <tomba@kernel.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









F:	Documentation/devicetree/bindings/display/ti/
































drivers/gpu/drm/drm_blend.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -185,12 +185,6 @@







 *		 plane does not expose the "alpha" property, then this is









 *		 assumed to be 1.0









 *









 * IN_FORMATS:









 *	Blob property which contains the set of buffer format and modifier









 *	pairs supported by this plane. The blob is a drm_format_modifier_blob









 *	struct. Without this property the plane doesn't support buffers with









 *	modifiers. Userspace cannot change this property.









 *









 * Note that all the property extensions described here apply either to the









 * plane or the CRTC (e.g. for the background color, which currently is not









 * exposed and assumed to be black).
































drivers/gpu/drm/drm_fb_helper.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -2496,6 +2496,11 @@ void drm_fbdev_generic_setup(struct drm_device *dev,







		return;









	}



















	/*









	 * FIXME: This mixes up depth with bpp, which results in a glorious









	 * mess, resulting in some drivers picking wrong fbdev defaults and









	 * others wrong preferred_depth defaults.









	 */









	if (!preferred_bpp)









		preferred_bpp = dev->mode_config.preferred_depth;









	if (!preferred_bpp)