diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-27 20:28:23 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-27 20:28:23 -0400 |
| commit | 3f346d5dcb591c2a5a26653d093af710cf2e5a31 (patch) | |
| tree | 24384b63b4ba23912afa6dac409f354b097156ff | |
| parent | 196ebdcc1db26977948c760664f024fa766950e4 (diff) | |
| parent | 089cfdd9b0ec1b21d3356d2e057f69b89d46ae66 (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
...
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 | |||
| 130 | Bridge 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 | |||
| 201 | EDID Helper Functions Reference | 208 | EDID 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 | |||
| 110 | attempted on some ARM embedded platforms. Such drivers really must have | 110 | attempted on some ARM embedded platforms. Such drivers really must have |
| 111 | a hardware-specific ioctl to allocate suitable buffer objects. | 111 | a hardware-specific ioctl to allocate suitable buffer objects. |
| 112 | 112 | ||
| 113 | Plane Abstraction | ||
| 114 | ================= | ||
| 115 | |||
| 116 | .. kernel-doc:: drivers/gpu/drm/drm_plane.c | ||
| 117 | :doc: overview | ||
| 118 | |||
| 119 | Plane 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 | |||
| 113 | Display Modes Function Reference | 128 | Display Modes Function Reference |
| 114 | ================================ | 129 | ================================ |
| 115 | 130 | ||
| @@ -177,50 +192,6 @@ allocated and zeroed by the driver, possibly as part of a larger | |||
| 177 | structure, and registered with a call to :c:func:`drm_crtc_init()` | 192 | structure, and registered with a call to :c:func:`drm_crtc_init()` |
| 178 | with a pointer to CRTC functions. | 193 | with a pointer to CRTC functions. |
| 179 | 194 | ||
| 180 | Planes (:c:type:`struct drm_plane <drm_plane>`) | ||
| 181 | ----------------------------------------------- | ||
| 182 | |||
| 183 | A plane represents an image source that can be blended with or overlayed | ||
| 184 | on top of a CRTC during the scanout process. Planes are associated with | ||
| 185 | a frame buffer to crop a portion of the image memory (source) and | ||
| 186 | optionally scale it to a destination size. The result is then blended | ||
| 187 | with or overlayed on top of a CRTC. | ||
| 188 | |||
| 189 | The 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 | ||
