summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorRamalingam C2019-05-07 18:27:35 +0200
committerDaniel Vetter2019-05-09 09:44:41 +0200
commit585b000de23ba06818975734da2303bd6ba2dcdd (patch)
tree700a8daaece08b415ab052b2a6687c842acfca27 /include/drm
parentdrm/i915: Seal races between async GPU cancellation, retirement and signaling (diff)
downloadkernel-qcow2-linux-585b000de23ba06818975734da2303bd6ba2dcdd.tar.gz
kernel-qcow2-linux-585b000de23ba06818975734da2303bd6ba2dcdd.tar.xz
kernel-qcow2-linux-585b000de23ba06818975734da2303bd6ba2dcdd.zip
drm: move content protection property to mode_config
Content protection property is created once and stored in drm_mode_config. And attached to all HDCP capable connectors. Signed-off-by: Ramalingam C <ramalingam.c@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20190507162745.25600-2-ramalingam.c@intel.com
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_connector.h6
-rw-r--r--include/drm/drm_mode_config.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 02a131202add..5e41942e5679 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1062,12 +1062,6 @@ struct drm_connector {
struct drm_property *vrr_capable_property;
/**
- * @content_protection_property: DRM ENUM property for content
- * protection. See drm_connector_attach_content_protection_property().
- */
- struct drm_property *content_protection_property;
-
- /**
* @colorspace_property: Connector property to set the suitable
* colorspace supported by the sink.
*/
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 7f60e8eb269a..5764ee3c7453 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -836,6 +836,12 @@ struct drm_mode_config {
*/
struct drm_property *writeback_out_fence_ptr_property;
+ /**
+ * @content_protection_property: DRM ENUM property for content
+ * protection. See drm_connector_attach_content_protection_property().
+ */
+ struct drm_property *content_protection_property;
+
/* dumb ioctl parameters */
uint32_t preferred_depth, prefer_shadow;