diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-03-12 05:42:41 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-03-12 05:42:56 +0300 |
| commit | 9e12da086e5e38f7b4f8d6e02a82447f4165fbee (patch) | |
| tree | 96e6029378ccb9ae3f9530d019c8216a3ca4a556 /drivers/gpu/drm/drm_sysfs.c | |
| parent | d3bd37f587b4438d47751d0f1d5aaae3d39bd416 (diff) | |
| parent | bc1a4130fc0309cc2f43b9cc616ebbc295e886ff (diff) | |
| download | linux-9e12da086e5e38f7b4f8d6e02a82447f4165fbee.tar.xz | |
Merge tag 'drm-misc-next-2020-03-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
Driver Changes:
- fb-helper: Remove drm_fb_helper_{add,add_all,remove}_one_connector
- fbdev: some cleanups and dead-code removal
- Conversions to simple-encoder
- zero-length array removal
- Panel: panel-dpi support in panel-simple, Novatek NT35510, Elida
KD35T133,
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200309135439.dicfnbo4ikj4tkz7@gilmour
Diffstat (limited to 'drivers/gpu/drm/drm_sysfs.c')
| -rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index dd2bc85f43cc..2e83c3d72af9 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -85,7 +85,6 @@ int drm_sysfs_init(void) } drm_class->devnode = drm_devnode; - drm_setup_hdcp_srm(drm_class); return 0; } @@ -98,7 +97,6 @@ void drm_sysfs_destroy(void) { if (IS_ERR_OR_NULL(drm_class)) return; - drm_teardown_hdcp_srm(drm_class); class_remove_file(drm_class, &class_attr_version.attr); class_destroy(drm_class); drm_class = NULL; |