aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-09-27 20:28:23 -0400
committerDave Airlie <airlied@redhat.com>2016-09-27 20:28:23 -0400
commit3f346d5dcb591c2a5a26653d093af710cf2e5a31 (patch)
tree24384b63b4ba23912afa6dac409f354b097156ff
parent196ebdcc1db26977948c760664f024fa766950e4 (diff)
parent089cfdd9b0ec1b21d3356d2e057f69b89d46ae66 (diff)
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 ...
-rw-r--r--Documentation/gpu/drm-kms-helpers.rst10
-rw-r--r--Documentation/gpu/drm-kms.rst78
-rw-r--r--Documentation/gpu/kms-properties.csv21
-rw-r--r--drivers/dma-buf/sync_file.c7
-rw-r--r--drivers/gpu/drm/Makefile3
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c3
-rw-r--r--drivers/gpu/drm/arc/arcpgu_drv.c4
-rw-r--r--drivers/gpu/drm/arm/hdlcd_drv.c4
-rw-r--r--drivers/gpu/drm/arm/malidp_drv.c4
-rw-r--r--drivers/gpu/drm/ast/ast_ttm.c3
-rw-r--r--drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c4
-rw-r--r--drivers/gpu/drm/bochs/bochs_kms.c2
-rw-r--r--drivers/gpu/drm/bochs/bochs_mm.c3
-rw-r--r--drivers/gpu/drm/bridge/analogix/analogix_dp_core.c311
-rw-r--r--drivers/gpu/drm/bridge/analogix/analogix_dp_core.h40
-rw-r--r--drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c451
-rw-r--r--drivers/gpu/drm/cirrus/cirrus_ttm.c3
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c2
-rw-r--r--drivers/gpu/drm/drm_blend.c199
-rw-r--r--drivers/gpu/drm/drm_bridge.c5
-rw-r--r--drivers/gpu/drm/drm_bufs.c14
-rw-r--r--drivers/gpu/drm/drm_color_mgmt.c296
-rw-r--r--drivers/gpu/drm/drm_crtc.c1263
-rw-r--r--drivers/gpu/drm/drm_crtc_helper_internal.h7
-rw-r--r--drivers/gpu/drm/drm_crtc_internal.h45
-rw-r--r--drivers/gpu/drm/drm_dp_helper.c1
-rw-r--r--drivers/gpu/drm/drm_drv.c65
-rw-r--r--drivers/gpu/drm/drm_encoder.c17
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c2
-rw-r--r--drivers/gpu/drm/drm_fops.c1
-rw-r--r--drivers/gpu/drm/drm_framebuffer.c26
-rw-r--r--drivers/gpu/drm/drm_gem.c8
-rw-r--r--drivers/gpu/drm/drm_info.c4
-rw-r--r--drivers/gpu/drm/drm_internal.h3
-rw-r--r--drivers/gpu/drm/drm_ioc32.c1
-rw-r--r--drivers/gpu/drm/drm_ioctl.c1
-rw-r--r--drivers/gpu/drm/drm_pci.c4
-rw-r--r--drivers/gpu/drm/drm_plane.c907
-rw-r--r--drivers/gpu/drm/drm_platform.c4
-rw-r--r--drivers/gpu/drm/drm_sysfs.c8
-rw-r--r--drivers/gpu/drm/drm_vma_manager.c40
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_drv.c4
-rw-r--r--drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c4
-rw-r--r--drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c4
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_drv.c4
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_ttm.c3
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c4
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c3
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c4
-rw-r--r--drivers/gpu/drm/qxl/qxl_ttm.c3
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c3
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_drv.c4
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_drv.c4
-rw-r--r--drivers/gpu/drm/sti/sti_drv.c4
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_drv.c4
-rw-r--r--drivers/gpu/drm/tegra/drm.c4
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c6
-rw-r--r--drivers/gpu/drm/udl/udl_drv.c4
-rw-r--r--drivers/gpu/drm/vc4/vc4_drv.c4
-rw-r--r--drivers/gpu/drm/vgem/vgem_drv.c4
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_drm_bus.c4
-rw-r--r--include/drm/drmP.h1
-rw-r--r--include/drm/drm_atomic.h154
-rw-r--r--include/drm/drm_blend.h62
-rw-r--r--include/drm/drm_bridge.h218
-rw-r--r--include/drm/drm_color_mgmt.h61
-rw-r--r--include/drm/drm_connector.h28
-rw-r--r--include/drm/drm_core.h34
-rw-r--r--include/drm/drm_crtc.h887
-rw-r--r--include/drm/drm_edid.h30
-rw-r--r--include/drm/drm_encoder.h22
-rw-r--r--include/drm/drm_fb_helper.h5
-rw-r--r--include/drm/drm_framebuffer.h17
-rw-r--r--include/drm/drm_mode_object.h1
-rw-r--r--include/drm/drm_modes.h6
-rw-r--r--include/drm/drm_plane.h526
-rw-r--r--include/drm/drm_property.h1
-rw-r--r--include/drm/drm_vma_manager.h20
-rw-r--r--include/uapi/linux/sync_file.h13
79 files changed, 3020 insertions, 3018 deletions
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index 59fa3c11efab..bb4254d19cbb 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -126,6 +126,13 @@ Default bridge callback sequence
126.. kernel-doc:: drivers/gpu/drm/drm_bridge.c 126.. kernel-doc:: drivers/gpu/drm/drm_bridge.c
127 :doc: bridge callbacks 127 :doc: bridge callbacks
128 128
129
130Bridge Helper Reference
131-------------------------
132
133.. kernel-doc:: include/drm/drm_bridge.h
134 :internal:
135
129.. kernel-doc:: drivers/gpu/drm/drm_bridge.c 136.. kernel-doc:: drivers/gpu/drm/drm_bridge.c
130 :export: 137 :export:
131 138
@@ -201,6 +208,9 @@ Output Probing Helper Functions Reference
201EDID Helper Functions Reference 208EDID Helper Functions Reference
202=============================== 209===============================
203 210
211.. kernel-doc:: include/drm/drm_edid.h
212 :internal:
213
204.. kernel-doc:: drivers/gpu/drm/drm_edid.c 214.. kernel-doc:: drivers/gpu/drm/drm_edid.c
205 :export: 215 :export:
206 216
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
index f9a991bb87d4..53b872c105d2 100644
--- a/Documentation/gpu/drm-kms.rst
+++ b/Documentation/gpu/drm-kms.rst
@@ -110,6 +110,21 @@ Note that dumb objects may not be used for gpu acceleration, as has been
110attempted on some ARM embedded platforms. Such drivers really must have 110attempted on some ARM embedded platforms. Such drivers really must have
111a hardware-specific ioctl to allocate suitable buffer objects. 111a hardware-specific ioctl to allocate suitable buffer objects.
112 112
113Plane Abstraction
114=================
115
116.. kernel-doc:: drivers/gpu/drm/drm_plane.c
117 :doc: overview
118
119Plane Functions Reference
120-------------------------
121
122.. kernel-doc:: include/drm/drm_plane.h
123 :internal:
124
125.. kernel-doc:: drivers/gpu/drm/drm_plane.c
126 :export:
127
113Display Modes Function Reference 128Display Modes Function Reference
114================================ 129================================
115 130
@@ -177,50 +192,6 @@ allocated and zeroed by the driver, possibly as part of a larger
177structure, and registered with a call to :c:func:`drm_crtc_init()` 192structure, and registered with a call to :c:func:`drm_crtc_init()`
178with a pointer to CRTC functions. 193with a pointer to CRTC functions.
179 194
180Planes (:c:type:`struct drm_plane <drm_plane>`)
181-----------------------------------------------
182
183A plane represents an image source that can be blended with or overlayed
184on top of a CRTC during the scanout process. Planes are associated with
185a frame buffer to crop a portion of the image memory (source) and
186optionally scale it to a destination size. The result is then blended
187with or overlayed on top of a CRTC.
188
189The DRM core recognizes three types of planes:
190
191- DRM_PLANE_TYPE_PRIMARY represents a "main" plane for a CRTC.
192 Primary planes are the planes operated upon by CRTC modesetting and
193 flipping operations described in the page_flip hook in
194 :c:type:`struct drm_crtc_funcs <drm_crtc_funcs>`.
195- DRM_PLANE_TYPE_CURSOR represents a "cursor" plane for a CRTC.
196 Cursor planes are the planes operated upon by the