diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-04-24 13:12:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-04-24 13:12:19 +1000 |
| commit | 126a34061eec2df05a5a28052edefd4e6125f31c (patch) | |
| tree | c8938ff9da3670a8b354b1fa8a0980acf539891c /include | |
| parent | 1aa63ddf726ea049279989b93b69b57ce6efd75b (diff) | |
| parent | 776d58823a60c689816972b51100cb322a0834ce (diff) | |
Merge tag 'drm-misc-next-2020-04-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.8:
UAPI Changes:
Cross-subsystem Changes:
* MAINTAINERS: adapt several filenames to changes in panel code
* arch/arm, fbdev: Use GPIO descriptors in sa11x0
* dma-buf: Fix typo in documentation
Core Changes:
* drm: Don't free framebuffer in drm_gem_fb_init()
* drm: Document struct drm_device.dev_private being deprecated
* drm: Merged topic/phy-compliance-202004-08
Driver Changes:
* drm/adv7511: Add support for HDMI SPDIF and additional sampling rates
* drm/ast: Allocate CRTC state of correct size
* drm/panel: convert many driver bindings to DT schema; add port/ports property
to bindings
* drm/rockchip: Convert rk3066 bindings to YAML; spelling fixes
* fbdev/arcfb: Call request_irq(), free_irq() at appropriate places
* fbdev/controlfb: Support COMPILE_TEST; cleanups
* fbdev/imxfb: Fix unbalanced enables/disables
* fbdev/s1d13xxxfb: Call unregister_framebuffer()
* fbdev/ssd1307fb: Use atomic PWM API, device properties and probe_new();
cleanups
* fbdev/vesafb: Call release_region()
* cleanups of includes, unused types/variables/fields, and fallthrough
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200423083425.GA15883@linux-uq9g
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_device.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index d39132b477dd..a55874db9dd4 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -88,9 +88,12 @@ struct drm_device { /** * @dev_private: * - * DRM driver private data. Instead of using this pointer it is - * recommended that drivers use drm_dev_init() and embed struct - * &drm_device in their larger per-device structure. + * DRM driver private data. This is deprecated and should be left set to + * NULL. + * + * Instead of using this pointer it is recommended that drivers use + * drm_dev_init() and embed struct &drm_device in their larger + * per-device structure. */ void *dev_private; |