From f302e1e4fdd6b697827b97eebbdded7d405c789b Mon Sep 17 00:00:00 2001 From: Yakir Yang Date: Fri, 25 Sep 2015 09:33:53 +0800 Subject: [PATCH] CHROMIUM: drm: Add "Enabled" value back to "Content Protection" property Although this property value have been deleted from the latest FROMLIST version (CL:266854), but the chromeos would want driver to report the property to "Enabled" when hardware HDCP have been enabled successfully, so let's add this back. BUG=chrome-os-partner:56883 TEST=None Signed-off-by: Yakir Yang Signed-off-by: Ziyuan Xu Reviewed-on: https://chromium-review.googlesource.com/403974 Reviewed-by: Sean Paul Change-Id: Icc52d4a83ac434e898be1190cf934ed8333e78bf Signed-off-by: Wyon Bi --- drivers/gpu/drm/drm_crtc.c | 1 + include/uapi/drm/drm_mode.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index b710f06822df..4802d5458a13 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -81,6 +81,7 @@ static const struct drm_prop_enum_list drm_plane_type_enum_list[] = { static struct drm_prop_enum_list drm_cp_enum_list[] = { { DRM_MODE_CONTENT_PROTECTION_UNDESIRED, "Undesired" }, { DRM_MODE_CONTENT_PROTECTION_DESIRED, "Desired" }, + { DRM_MODE_CONTENT_PROTECTION_ENABLED, "Enabled" }, }; DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index d3366250a60a..e2f7b7ced60f 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -98,6 +98,7 @@ /* Content Protection Flags */ #define DRM_MODE_CONTENT_PROTECTION_UNDESIRED 0 #define DRM_MODE_CONTENT_PROTECTION_DESIRED 1 +#define DRM_MODE_CONTENT_PROTECTION_ENABLED 2 /* Scaling mode options */ #define DRM_MODE_SCALE_NONE 0 /* Unmodified timing (display or