diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
| commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
| tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /drivers/gpu/drm/drm_internal.h | |
| parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
| parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_internal.h')
| -rw-r--r-- | drivers/gpu/drm/drm_internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 76bd4b81c5b1..596e9f4ca7fc 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -116,6 +116,7 @@ void drm_sysfs_connector_remove(struct drm_connector *connector); void drm_sysfs_lease_event(struct drm_device *dev); /* drm_gem.c */ +struct drm_gem_object; int drm_gem_init(struct drm_device *dev); void drm_gem_destroy(struct drm_device *dev); int drm_gem_handle_create_tail(struct drm_file *file_priv, @@ -211,3 +212,7 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent, const struct drm_framebuffer *fb); int drm_framebuffer_debugfs_init(struct drm_minor *minor); + +/* drm_hdcp.c */ +int drm_setup_hdcp_srm(struct class *drm_class); +void drm_teardown_hdcp_srm(struct class *drm_class); |