Commit 3f346d5d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-09-25' of git://anongit.freedesktop.org/drm-intel into drm-next 

- more core cleanup patches to prep drm_file to be used for
  kernel-internal contexts (David Herrmann)
- more split-up+docs for drm_crtc.c
- lots of small fixes and polish all over

* tag 'topic/drm-misc-2016-09-25' of git://anongit.freedesktop.org/drm-intel: (37 commits)
  drm: bridge: analogix/dp: mark symbols static where possible
  drm/bochs: mark bochs_connector_get_modes() static
  drm/bridge: analogix_dp: Improve panel on time
  drm/bridge: analogix_dp: Don't read EDID if panel present
  drm/bridge: analogix_dp: Remove duplicated code
  Revert "drm/i2c: tda998x: don't register the connector"
  drm: Fix plane type uabi breakage
  dma-buf/sync_file: free fences array in num_fences is 1
  drm/i2c: tda998x: don't register the connector
  drm: Don't swallow error codes in drm_dev_alloc()
  drm: Distinguish no name from ENOMEM in set_unique()
  drm: Remove dirty property from docs
  drm/doc: Document color space handling
  drm: Extract drm_color_mgmt.[hc]
  drm/doc: Polish plane composition property docs
  drm: Conslidate blending properties in drm_blend.[hc]
  drm/doc: Polish for drm_plane.[hc]
  drm: Extract drm_plane.[hc]
  drm/tilcdc: Add atomic and crtc headers to crtc.c
  drm: Fix typo in encoder docs
  ...
parents 196ebdcc 089cfdd9

Documentation/gpu/drm-kms-helpers.rst

+10 −0
Original line number Diff line number Diff line
@@ -126,6 +126,13 @@ Default bridge callback sequence 
.. kernel-doc:: drivers/gpu/drm/drm_bridge.c

   :doc: bridge callbacks





Bridge Helper Reference

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



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

   :internal:



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

   :export:
@@ -201,6 +208,9 @@ Output Probing Helper Functions Reference 
EDID Helper Functions Reference

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



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

   :internal:



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

   :export:

Documentation/gpu/drm-kms.rst

+32 −46
Original line number Diff line number Diff line
@@ -110,6 +110,21 @@ Note that dumb objects may not be used for gpu acceleration, as has been 
attempted on some ARM embedded platforms. Such drivers really must have

a hardware-specific ioctl to allocate suitable buffer objects.



Plane Abstraction

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



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

   :doc: overview



Plane Functions Reference

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



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

   :internal:



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

   :export:



Display Modes Function Reference

================================
@@ -177,50 +192,6 @@ allocated and zeroed by the driver, possibly as part of a larger 
structure, and registered with a call to :c:func:`drm_crtc_init()`

with a pointer to CRTC functions.



Planes (:c:type:`struct drm_plane <drm_plane>`)

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



A plane represents an image source that can be blended with or overlayed

on top of a CRTC during the scanout process. Planes are associated with

a frame buffer to crop a portion of the image memory (source) and

optionally scale it to a destination size. The result is then blended

with or overlayed on top of a CRTC.



The DRM core recognizes three types of planes:



-  DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC.

   Primary planes are the planes operated upon by CRTC modesetting and

   flipping operations described in the page_flip hook in

   :c:type:`struct drm_crtc_funcs <drm_crtc_funcs>`.

-  DRM_PLANE_TYPE_CURSOR represents a "cursor" plane for a CRTC.

   Cursor planes are the planes operated upon by the

   DRM_IOCTL_MODE_CURSOR and DRM_IOCTL_MODE_CURSOR2 ioctls.

-  DRM_PLANE_TYPE_OVERLAY represents all non-primary, non-cursor

   planes. Some drivers refer to these types of planes as "sprites"

   internally.



For compatibility with legacy userspace, only overlay planes are made

available to userspace by default. Userspace clients may set the

DRM_CLIENT_CAP_UNIVERSAL_PLANES client capability bit to indicate

that they wish to receive a universal plane list containing all plane

types.



Plane Initialization

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



To create a plane, a KMS drivers allocates and zeroes an instances of

:c:type:`struct drm_plane <drm_plane>` (possibly as part of a

larger structure) and registers it with a call to

:c:func:`drm_universal_plane_init()`. The function takes a

bitmask of the CRTCs that can be associated with the plane, a pointer to

the plane functions, a list of format supported formats, and the type of

plane (primary, cursor, or overlay) being initialized.



Cursor and overlay planes are optional. All drivers should provide one

primary plane per CRTC (although this requirement may change in the

future); drivers that do not wish to provide special handling for

primary planes may make use of the helper functions described in ? to

create and register a primary plane with standard capabilities.



Cleanup

-------
@@ -316,12 +287,27 @@ Property Types and Blob Property Support 
.. kernel-doc:: drivers/gpu/drm/drm_property.c

   :export:



Blending and Z-Position properties

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

Plane Composition Properties

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



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

   :doc: overview



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

   :export:



Color Management Properties

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



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

   :doc: overview



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

   :internal:



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

   :export:



Existing KMS Properties

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

Documentation/gpu/kms-properties.csv

+0 −21
Original line number Diff line number Diff line 
Owner Module/Drivers,Group,Property Name,Type,Property Values,Object attached,Description/Restrictions

DRM,Generic,“rotation”,BITMASK,"{ 0, ""rotate-0"" }, { 1, ""rotate-90"" }, { 2, ""rotate-180"" }, { 3, ""rotate-270"" }, { 4, ""reflect-x"" }, { 5, ""reflect-y"" }","CRTC, Plane",rotate-(degrees) rotates the image by the specified amount in degrees in counter clockwise direction. reflect-x and reflect-y reflects the image along the specified axis prior to rotation

,,“scaling mode”,ENUM,"{ ""None"", ""Full"", ""Center"", ""Full aspect"" }",Connector,"Supported by: amdgpu, gma500, i915, nouveau and radeon."

,Connector,“EDID”,BLOB | IMMUTABLE,0,Connector,Contains id of edid blob ptr object.

,,“DPMS”,ENUM,"{ “On”, “Standby”, “Suspend”, “Off” }",Connector,Contains DPMS operation mode value.

,,“PATH”,BLOB | IMMUTABLE,0,Connector,Contains topology path to a connector.

,,“TILE”,BLOB | IMMUTABLE,0,Connector,Contains tiling information for a connector.

,,“CRTC_ID”,OBJECT,DRM_MODE_OBJECT_CRTC,Connector,CRTC that connector is attached to (atomic)

,Plane,“type”,ENUM | IMMUTABLE,"{ ""Overlay"", ""Primary"", ""Cursor"" }",Plane,Plane type

,,“SRC_X”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source x coordinate in 16.16 fixed point (atomic)

,,“SRC_Y”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source y coordinate in 16.16 fixed point (atomic)

,,“SRC_W”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source width in 16.16 fixed point (atomic)

,,“SRC_H”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout source height in 16.16 fixed point (atomic)

,,“CRTC_X”,SIGNED_RANGE,"Min=INT_MIN, Max=INT_MAX",Plane,Scanout CRTC (destination) x coordinate (atomic)

,,“CRTC_Y”,SIGNED_RANGE,"Min=INT_MIN, Max=INT_MAX",Plane,Scanout CRTC (destination) y coordinate (atomic)

,,“CRTC_W”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout CRTC (destination) width (atomic)

,,“CRTC_H”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout CRTC (destination) height (atomic)

,,“FB_ID”,OBJECT,DRM_MODE_OBJECT_FB,Plane,Scanout framebuffer (atomic)

,,“CRTC_ID”,OBJECT,DRM_MODE_OBJECT_CRTC,Plane,CRTC that plane is attached to (atomic)

,,“zpos”,RANGE,"Min=0, Max=UINT_MAX","Plane,Z-order of the plane.Planes with higher Z-order values are displayed on top, planes with identical Z-order values are display in an undefined order"

,DVI-I,“subconnector”,ENUM,"{ “Unknown”, “DVI-D”, “DVI-A” }",Connector,TBD

,,“select subconnector”,ENUM,"{ “Automatic”, “DVI-D”, “DVI-A” }",Connector,TBD

,TV,“subconnector”,ENUM,"{ ""Unknown"", ""Composite"", ""SVIDEO"", ""Component"", ""SCART"" }",Connector,TBD
@@ -36,12 +23,6 @@ DRM,Generic,“rotation”,BITMASK,"{ 0, ""rotate-0"" }, { 1, ""rotate-90"" }, { 
,Virtual GPU,“suggested X”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an X offset for a connector

,,“suggested Y”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an Y offset for a connector

,Optional,"""aspect ratio""",ENUM,"{ ""None"", ""4:3"", ""16:9"" }",Connector,TDB

,,“dirty”,ENUM | IMMUTABLE,"{ ""Off"", ""On"", ""Annotate"" }",Connector,TBD

,,“DEGAMMA_LUT”,BLOB,0,CRTC,DRM property to set the degamma lookup table (LUT) mapping pixel data from the framebuffer before it is given to the transformation matrix. The data is an interpreted as an array of struct drm_color_lut elements. Hardware might choose not to use the full precision of the LUT elements nor use all the elements of the LUT (for example the hardware might choose to interpolate between LUT[0] and LUT[4]).

,,“DEGAMMA_LUT_SIZE”,RANGE | IMMUTABLE,"Min=0, Max=UINT_MAX",CRTC,DRM property to gives the size of the lookup table to be set on the DEGAMMA_LUT property (the size depends on the underlying hardware).

,,“CTM”,BLOB,0,CRTC,DRM property to set the current transformation matrix (CTM) apply to pixel data after the lookup through the degamma LUT and before the lookup through the gamma LUT. The data is an interpreted as a struct drm_color_ctm.

,,“GAMMA_LUT”,BLOB,0,CRTC,DRM property to set the gamma lookup table (LUT) mapping pixel data after to the transformation matrix to data sent to the connector. The data is an interpreted as an array of struct drm_color_lut elements. Hardware might choose not to use the full precision of the LUT elements nor use all the elements of the LUT (for example the hardware might choose to interpolate between LUT[0] and LUT[4]).

,,“GAMMA_LUT_SIZE”,RANGE | IMMUTABLE,"Min=0, Max=UINT_MAX",CRTC,DRM property to gives the size of the lookup table to be set on the GAMMA_LUT property (the size depends on the underlying hardware).

i915,Generic,"""Broadcast RGB""",ENUM,"{ ""Automatic"", ""Full"", ""Limited 16:235"" }",Connector,"When this property is set to Limited 16:235 and CTM is set, the hardware will be programmed with the result of the multiplication of CTM by the limited range matrix to ensure the pixels normaly in the range 0..1.0 are remapped to the range 16/255..235/255."

,,“audio”,ENUM,"{ ""force-dvi"", ""off"", ""auto"", ""on"" }",Connector,TBD

,SDVO-TV,“mode”,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD
@@ -95,7 +76,6 @@ armada,CRTC,"""CSC_YUV""",ENUM,"{ ""Auto"" , ""CCIR601"", ""CCIR709"" }",CRTC,TB 
,,"""contrast""",RANGE,"Min=0, Max=0x7fff",Plane,TBD

,,"""saturation""",RANGE,"Min=0, Max=0x7fff",Plane,TBD

exynos,CRTC,“mode”,ENUM,"{ ""normal"", ""blank"" }",CRTC,TBD

,Overlay,“zpos”,RANGE,"Min=0, Max=MAX_PLANE-1",Plane,TBD

i2c/ch7006_drv,Generic,“scale”,RANGE,"Min=0, Max=2",Connector,TBD

,TV,“mode”,ENUM,"{ ""PAL"", ""PAL-M"",""PAL-N""}, ”PAL-Nc"" , ""PAL-60"", ""NTSC-M"", ""NTSC-J"" }",Connector,TBD

nouveau,NV10 Overlay,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
@@ -126,4 +106,3 @@ radeon,DVI-I,“coherent”,RANGE,"Min=0, Max=1",Connector,TBD 
,FMT Dithering,“dither”,ENUM,"{ ""off"", ""on"" }",Connector,TBD

rcar-du,Generic,"""alpha""",RANGE,"Min=0, Max=255",Plane,TBD

,,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
 
,,"""zpos""",RANGE,"Min=1, Max=7",Plane,TBD

drivers/dma-buf/sync_file.c

+3 −4
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static int sync_file_set_fence(struct sync_file *sync_file, 
	 */

	if (num_fences == 1) {

		sync_file->fence = fences[0];

		kfree(fences);

	} else {

		array = fence_array_create(num_fences, fences,

					   fence_context_alloc(1), 1, false);
@@ -253,10 +254,8 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
	for (; i_b < b_num_fences; i_b++)

		add_fence(fences, &i, b_fences[i_b]);



	if (i == 0) {

		add_fence(fences, &i, a_fences[0]);

		i++;

	}

	if (i == 0)

		fences[i++] = fence_get(a_fences[0]);



	if (num_fences > i) {

		nfences = krealloc(fences, i * sizeof(*fences),

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o drm_atomic.o drm_bridge.o \

		drm_framebuffer.o drm_connector.o drm_blend.o \

		drm_encoder.o drm_mode_object.o drm_property.o

		drm_encoder.o drm_mode_object.o drm_property.o \

		drm_plane.o drm_color_mgmt.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE