Merge tag 'topic/hdcp-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 7d9ad20..46733d5 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1224,6 +1224,12 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
                state->picture_aspect_ratio = val;
        } else if (property == connector->scaling_mode_property) {
                state->scaling_mode = val;
+       } else if (property == connector->content_protection_property) {
+               if (val == DRM_MODE_CONTENT_PROTECTION_ENABLED) {
+                       DRM_DEBUG_KMS("only drivers can set CP Enabled\n");
+                       return -EINVAL;
+               }
+               state->content_protection = val;
        } else if (connector->funcs->atomic_set_property) {
                return connector->funcs->atomic_set_property(connector,
                                state, property, val);
@@ -1303,6 +1309,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
                *val = state->picture_aspect_ratio;
        } else if (property == connector->scaling_mode_property) {
                *val = state->scaling_mode;
+       } else if (property == connector->content_protection_property) {
+               *val = state->content_protection;
        } else if (connector->funcs->atomic_get_property) {
                return connector->funcs->atomic_get_property(connector,
                                state, property, val);