diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-09-26 16:19:21 -0400 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-08-15 17:28:40 +0800 |
| commit | e00541fcb23908157e7e5e126a672b2729335b09 (patch) | |
| tree | b7bdc3844163b69ffbebbf08ecd1d8b9abd0156c /include/drm | |
| parent | f65bdbbfcc45a3794663884630f0ed591d81fa78 (diff) | |
CHROMIUM: drm: Update Content Protection ABI
The Content Protection properties in 4.4 used v2 of the upstream
patches, but chrome (and upstream) prefer v1. This patch removes the ksv
property and reinstates the ENABLED enum value to the content protection
property.
BUG=b:63816472
TEST=Watch protected content on external display, ensure CP is
enabled/disabled properly by chrome
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/687800
Commit-Ready: Sean Paul <seanpaul@google.com>
Tested-by: Sean Paul <seanpaul@google.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Change-Id: I38cecce2d15b4d4b1ce95ef0e572a08f1bc97131
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 82b866608b81..e7fb665befea 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1640,7 +1640,6 @@ struct drm_mode_config { struct drm_property *prop_active; struct drm_property *prop_mode_id; struct drm_property *content_protection_property; - struct drm_property *content_protection_ksv_property; /* DVI-I properties */ struct drm_property *dvi_i_subconnector_property; |