Commit a1a98689 authored by Hans de Goede's avatar Hans de Goede
Browse files

drm: Add privacy-screen class (v4) 



On some new laptops the LCD panel has a builtin electronic privacy-screen.
We want to export this functionality as a property on the drm connector
object. But often this functionality is not exposed on the GPU but on some
other (ACPI) device.

This commit adds a privacy-screen class allowing the driver for these
other devices to register themselves as a privacy-screen provider; and
allowing the drm/kms code to get a privacy-screen provider associated
with a specific GPU/connector combo.

Changes in v2:
- Make CONFIG_DRM_PRIVACY_SCREEN a bool which controls if the drm_privacy
  code gets built as part of the main drm module rather then making it
  a tristate which builds its own module.
- Add a #if IS_ENABLED(CONFIG_DRM_PRIVACY_SCREEN) check to
  drm_privacy_screen_consumer.h and define stubs when the check fails.
  Together these 2 changes fix several dependency issues.
- Remove module related code now that this is part of the main drm.ko
- Use drm_class as class for the privacy-screen devices instead of
  adding a separate class for this

Changes in v3:
- Make the static inline drm_privacy_screen_get_state() stub set sw_state
  and hw_state to PRIVACY_SCREEN_DISABLED to squelch an uninitialized
  variable warning when CONFIG_DRM_PRIVICAY_SCREEN is not set

Changes in v4:
- Make drm_privacy_screen_set_sw_state() skip calling out to the hw if
  hw_state == new_sw_state

Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005202322.700909-3-hdegoede@redhat.com
parent 107fe904

Documentation/gpu/drm-kms-helpers.rst

+15 −0
Original line number Diff line number Diff line
@@ -435,3 +435,18 @@ Legacy CRTC/Modeset Helper Functions Reference 


.. kernel-doc:: drivers/gpu/drm/drm_crtc_helper.c

   :export:



Privacy-screen class

====================



.. kernel-doc:: drivers/gpu/drm/drm_privacy_screen.c

   :doc: overview



.. kernel-doc:: include/drm/drm_privacy_screen_driver.h

   :internal:



.. kernel-doc:: include/drm/drm_privacy_screen_machine.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_privacy_screen.c

   :export:

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6422,6 +6422,14 @@ F: drivers/gpu/drm/drm_panel.c 
F:	drivers/gpu/drm/panel/

F:	include/drm/drm_panel.h









DRM PRIVACY-SCREEN CLASS









M:	Hans de Goede <hdegoede@redhat.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc









F:	drivers/gpu/drm/drm_privacy_screen*









F:	include/drm/drm_privacy_screen*

















DRM TTM SUBSYSTEM









M:	Christian Koenig <christian.koenig@amd.com>









M:	Huang Rui <ray.huang@amd.com>
































drivers/gpu/drm/Kconfig



+4
−0






























Original line number
Diff line number
Diff line







@@ -496,3 +496,7 @@ config DRM_PANEL_ORIENTATION_QUIRKS







config DRM_LIB_RANDOM









	bool









	default n



















config DRM_PRIVACY_SCREEN









	bool









	default n
























drivers/gpu/drm/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -32,6 +32,7 @@ drm-$(CONFIG_OF) += drm_of.o







drm-$(CONFIG_PCI) += drm_pci.o









drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o









drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o









drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o



















obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o










































drivers/gpu/drm/drm_drv.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -43,6 +43,7 @@







#include <drm/drm_managed.h>









#include <drm/drm_mode_object.h>









#include <drm/drm_print.h>









#include <drm/drm_privacy_screen_machine.h>



















#include "drm_crtc_internal.h"









#include "drm_internal.h"








@@ -1029,6 +1030,7 @@ static const struct file_operations drm_stub_fops = {

















static void drm_core_exit(void)









{









	drm_privacy_screen_lookup_exit();









	unregister_chrdev(DRM_MAJOR, "drm");









	debugfs_remove(drm_debugfs_root);









	drm_sysfs_destroy();








@@ -1056,6 +1058,8 @@ static int __init drm_core_init(void)







	if (ret < 0)









		goto error;



















	drm_privacy_screen_lookup_init();



















	drm_core_init_complete = true;



















	DRM_DEBUG("Initialized\n");