diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-31 17:31:09 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-31 17:31:09 -0500 |
| commit | 012bbe28c0e3a479ec7ba6f311710cf8409647d4 (patch) | |
| tree | 9cfe299e0cfa72a078faa73d5c0a9263d2ebe8a2 /include | |
| parent | bb7e98334157de206d7b1283377fdb4ea9e2e8c6 (diff) | |
| parent | 55d6616585363ff2aa9430bfe1ff1345bdc0599a (diff) | |
Merge tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Another round of -misc stuff:
- Noralf debugfs cleanup cleanup (not yet everything, some more driver
patches awaiting acks).
- More doc work.
- edid/infoframe fixes from Ville.
- misc 1-patch fixes all over, as usual
Noralf needs this for his tinydrm pull request.
* tag 'drm-misc-next-2017-01-30' of git://anongit.freedesktop.org/git/drm-misc: (48 commits)
drm/vc4: Remove vc4_debugfs_cleanup()
dma/fence: Export enable-signaling tracepoint for emission by drivers
drm/tilcdc: Remove tilcdc_debugfs_cleanup()
drm/tegra: Remove tegra_debugfs_cleanup()
drm/sti: Remove drm_debugfs_remove_files() calls
drm/radeon: Remove drm_debugfs_remove_files() call
drm/omap: Remove omap_debugfs_cleanup()
drm/hdlcd: Remove hdlcd_debugfs_cleanup()
drm/etnaviv: Remove etnaviv_debugfs_cleanup()
drm/etnaviv: allow build with COMPILE_TEST
drm/amd/amdgpu: Remove drm_debugfs_remove_files() call
drm/prime: Clarify DMA-BUF/GEM Object lifetime
drm/ttm: Make sure BOs being swapped out are cacheable
drm/atomic: Remove drm_atomic_debugfs_cleanup()
drm: drm_minor_register(): Clean up debugfs on failure
drm: debugfs: Remove all files automatically on cleanup
drm/fourcc: add vivante tiled layout format modifiers
drm/edid: Set YQ bits in the AVI infoframe according to CEA-861-F
drm/edid: Set AVI infoframe Q even when QS=0
drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range()
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 15 | ||||
| -rw-r--r-- | include/drm/drm_atomic.h | 6 | ||||
| -rw-r--r-- | include/drm/drm_atomic_helper.h | 13 | ||||
| -rw-r--r-- | include/drm/drm_auth.h | 12 | ||||
| -rw-r--r-- | include/drm/drm_color_mgmt.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_connector.h | 42 | ||||
| -rw-r--r-- | include/drm/drm_crtc.h | 60 | ||||
| -rw-r--r-- | include/drm/drm_dp_mst_helper.h | 14 | ||||
| -rw-r--r-- | include/drm/drm_drv.h | 32 | ||||
| -rw-r--r-- | include/drm/drm_edid.h | 10 | ||||
| -rw-r--r-- | include/drm/drm_encoder.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_fb_cma_helper.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_flip_work.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_framebuffer.h | 15 | ||||
| -rw-r--r-- | include/drm/drm_gem.h | 16 | ||||
| -rw-r--r-- | include/drm/drm_irq.h | 4 | ||||
| -rw-r--r-- | include/drm/drm_mode_config.h | 12 | ||||
| -rw-r--r-- | include/drm/drm_mode_object.h | 13 | ||||
| -rw-r--r-- | include/drm/drm_modes.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_modeset_helper_vtables.h | 146 | ||||
| -rw-r--r-- | include/drm/drm_modeset_lock.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_plane.h | 24 | ||||
| -rw-r--r-- | include/drm/drm_property.h | 8 | ||||
| -rw-r--r-- | include/drm/drm_simple_kms_helper.h | 16 | ||||
| -rw-r--r-- | include/uapi/drm/drm_fourcc.h | 41 |
25 files changed, 283 insertions, 228 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e5882d5a68e5..21a3a666a2fd 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -790,21 +790,6 @@ extern void drm_sysfs_hotplug_event(struct drm_device *dev); | |||
| 790 | 790 | ||
| 791 | /*@}*/ | 791 | /*@}*/ |
| 792 | 792 | ||
| 793 | /* PCI section */ | ||
| 794 | static __inline__ int drm_pci_device_is_agp(struct drm_device *dev) | ||
| 795 | { | ||
| 796 | if (dev->driver->device_is_agp != NULL) { | ||
| 797 | int err = (*dev->driver->device_is_agp) (dev); | ||
| 798 | |||
| 799 | if (err != 2) { | ||
| 800 | return err; | ||
| 801 | } | ||
| 802 | } | ||
| 803 | |||
| 804 | return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); | ||
| 805 | } | ||
| 806 | void drm_pci_agp_destroy(struct drm_device *dev); | ||
| 807 | |||
| 808 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); | 793 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); |
| 809 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); | 794 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); |
| 810 | #ifdef CONFIG_PCI | 795 | #ifdef CONFIG_PCI |
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index f96220ed4004..2e28fdca9c3d 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h | |||
| @@ -123,7 +123,8 @@ struct drm_crtc_commit { | |||
| 123 | /** | 123 | /** |
| 124 | * @commit_entry: | 124 | * @commit_entry: |
| 125 | * | 125 | * |
| 126 | * Entry on the per-CRTC commit_list. Protected by crtc->commit_lock. | 126 | * Entry on the per-CRTC &drm_crtc.commit_list. Protected by |
| 127 | * $drm_crtc.commit_lock. | ||
| 127 | */ | 128 | */ |
| 128 | struct list_head commit_entry; | 129 | struct list_head commit_entry; |
| 129 | 130 | ||
| @@ -429,7 +430,8 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p); | |||
| 429 | * | 430 | * |
| 430 | * For example if the CRTC mode has changed, and the hardware is able to enact | 431 | * For example if the CRTC mode has changed, and the hardware is able to enact |
| 431 | * the requested mode change without going through a full modeset, the driver | 432 | * the requested mode change without going through a full modeset, the driver |
| 432 | * should clear mode_changed during its ->atomic_check. | 433 | * should clear mode_changed in its &drm_mode_config_funcs.atomic_check |
| 434 | * implementation. | ||
| 433 | */ | 435 | */ |
| 434 | static inline bool | 436 | static inline bool |
| 435 | drm_atomic_crtc_needs_modeset(const struct drm_crtc_state *state) | 437 | drm_atomic_crtc_needs_modeset(const struct drm_crtc_state *state) |
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 9afcd3810785..d066e9491ae3 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h | |||
| @@ -177,7 +177,8 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, | |||
| 177 | * | 177 | * |
| 178 | * This iterates over the current state, useful (for example) when applying | 178 | * This iterates over the current state, useful (for example) when applying |
| 179 | * atomic state after it has been checked and swapped. To iterate over the | 179 | * atomic state after it has been checked and swapped. To iterate over the |
| 180 | * planes which *will* be attached (for ->atomic_check()) see | 180 | * planes which *will* be attached (more useful in code called from |
| 181 | * &drm_mode_config_funcs.atomic_check) see | ||
| 181 | * drm_atomic_crtc_state_for_each_plane(). | 182 | * drm_atomic_crtc_state_for_each_plane(). |
| 182 | */ | 183 | */ |
| 183 | #define drm_atomic_crtc_for_each_plane(plane, crtc) \ | 184 | #define drm_atomic_crtc_for_each_plane(plane, crtc) \ |
| @@ -189,8 +190,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, | |||
| 189 | * @crtc_state: the incoming crtc-state | 190 | * @crtc_state: the incoming crtc-state |
| 190 | * | 191 | * |
| 191 | * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be | 192 | * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be |
| 192 | * attached if the specified state is applied. Useful during (for example) | 193 | * attached if the specified state is applied. Useful during for example |
| 193 | * ->atomic_check() operations, to validate the incoming state. | 194 | * in code called from &drm_mode_config_funcs.atomic_check operations, to |
| 195 | * validate the incoming state. | ||
| 194 | */ | 196 | */ |
| 195 | #define drm_atomic_crtc_state_for_each_plane(plane, crtc_state) \ | 197 | #define drm_atomic_crtc_state_for_each_plane(plane, crtc_state) \ |
| 196 | drm_for_each_plane_mask(plane, (crtc_state)->state->dev, (crtc_state)->plane_mask) | 198 | drm_for_each_plane_mask(plane, (crtc_state)->state->dev, (crtc_state)->plane_mask) |
| @@ -202,8 +204,9 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, | |||
| 202 | * @crtc_state: the incoming crtc-state | 204 | * @crtc_state: the incoming crtc-state |
| 203 | * | 205 | * |
| 204 | * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be | 206 | * Similar to drm_crtc_for_each_plane(), but iterates the planes that will be |
| 205 | * attached if the specified state is applied. Useful during (for example) | 207 | * attached if the specified state is applied. Useful during for example |
| 206 | * ->atomic_check() operations, to validate the incoming state. | 208 | * in code called from &drm_mode_config_funcs.atomic_check operations, to |
| 209 | * validate the incoming state. | ||
| 207 | * | 210 | * |
| 208 | * Compared to just drm_atomic_crtc_state_for_each_plane() this also fills in a | 211 | * Compared to just drm_atomic_crtc_state_for_each_plane() this also fills in a |
| 209 | * const plane_state. This is useful when a driver just wants to peek at other | 212 | * const plane_state. This is useful when a driver just wants to peek at other |
diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h index eecbc2f43f55..1eb4a52cad8d 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h | |||
| @@ -43,18 +43,18 @@ struct drm_master { | |||
| 43 | struct kref refcount; | 43 | struct kref refcount; |
| 44 | struct drm_device *dev; | 44 | struct drm_device *dev; |
| 45 | /** | 45 | /** |
| 46 | * @unique: Unique identifier: e.g. busid. Protected by struct | 46 | * @unique: Unique identifier: e.g. busid. Protected by |
| 47 | * &drm_device master_mutex. | 47 | * &drm_device.master_mutex. |
| 48 | */ | 48 | */ |
| 49 | char *unique; | 49 | char *unique; |
| 50 | /** | 50 | /** |
| 51 | * @unique_len: Length of unique field. Protected by &struct drm_device | 51 | * @unique_len: Length of unique field. Protected by |
| 52 | * master_mutex. | 52 | * &drm_device.master_mutex. |
| 53 | */ | 53 | */ |
| 54 | int unique_len; | 54 | int unique_len; |
| 55 | /** | 55 | /** |
| 56 | * @magic_map: Map of used authentication tokens. Protected by struct | 56 | * @magic_map: Map of used authentication tokens. Protected by |
| 57 | * &drm_device master_mutex. | 57 | * &drm_device.master_mutex. |
| 58 | */ | 58 | */ |
| 59 | struct idr magic_map; | 59 | struct idr magic_map; |
| 60 | struct drm_lock_data lock; | 60 | struct drm_lock_data lock; |
diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h index c767238ac9d5..d9c2f680f5ae 100644 --- a/include/drm/drm_color_mgmt.h +++ b/include/drm/drm_color_mgmt.h | |||
| @@ -34,7 +34,7 @@ int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, | |||
| 34 | int gamma_size); | 34 | int gamma_size); |
| 35 | 35 | ||
| 36 | /** | 36 | /** |
| 37 | * drm_color_lut_extract - clamp&round LUT entries | 37 | * drm_color_lut_extract - clamp and round LUT entries |
| 38 | * @user_input: input value | 38 | * @user_input: input value |
| 39 | * @bit_precision: number of bits the hw LUT supports | 39 | * @bit_precision: number of bits the hw LUT supports |
| 40 | * | 40 | * |
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index d489cc003b7e..e5e1eddd19fb 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h | |||
| @@ -331,15 +331,15 @@ struct drm_connector_funcs { | |||
| 331 | * | 331 | * |
| 332 | * Entry point for output detection and basic mode validation. The | 332 | * Entry point for output detection and basic mode validation. The |
| 333 | * driver should reprobe the output if needed (e.g. when hotplug | 333 | * driver should reprobe the output if needed (e.g. when hotplug |
| 334 | * handling is unreliable), add all detected modes to connector->modes | 334 | * handling is unreliable), add all detected modes to &drm_connector.modes |
| 335 | * and filter out any the device can't support in any configuration. It | 335 | * and filter out any the device can't support in any configuration. It |
| 336 | * also needs to filter out any modes wider or higher than the | 336 | * also needs to filter out any modes wider or higher than the |
| 337 | * parameters max_width and max_height indicate. | 337 | * parameters max_width and max_height indicate. |
| 338 | * | 338 | * |
| 339 | * The drivers must also prune any modes no longer valid from | 339 | * The drivers must also prune any modes no longer valid from |
| 340 | * connector->modes. Furthermore it must update connector->status and | 340 | * &drm_connector.modes. Furthermore it must update |
| 341 | * connector->edid. If no EDID has been | ||
