CHROMIUM: drm/i915: Allow content protection to be set via legacy ioctl
Instead of using atomic + modeset, allow legacy property set ioctl to
immediately enable content protection.
Change-Id: Ie738077263ba2972f1d94ea0a82d77fa26edc310
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/849086
Commit-Ready: Sean Paul <seanpaul@google.com>
Tested-by: Sean Paul <seanpaul@google.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 8be0de3..2037ea2 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4724,6 +4724,10 @@
goto done;
}
+ if (property == connector->content_protection_property)
+ return drm_atomic_helper_connector_set_property(connector,
+ property, val);
+
return -EINVAL;
done:
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index be13819..d0e87e8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1905,6 +1905,10 @@
goto done;
}
+ if (property == connector->content_protection_property)
+ return drm_atomic_helper_connector_set_property(connector,
+ property, val);
+
return -EINVAL;
done:
