drm/privacy_screen: Add drvdata in drm_privacy_screen

Allow a privacy screen provider to stash its private data pointer in the
drm_privacy_screen, and update the drm_privacy_screen_register() call to
accept that. Also introduce a *_get_drvdata() so that it can retrieved
back when needed.

This also touches the IBM Thinkpad platform driver, the only user of
privacy screen today, to pass NULL for now to the updated API.

Signed-off-by: Rajat Jain <rajatja@google.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220107190208.95479-1-rajatja@google.com

diff --git a/drivers/gpu/drm/drm_privacy_screen.c b/drivers/gpu/drm/drm_privacy_screen.c
index beaf99e9120a609b01166c566d8381e24739bbf2..03b149cc455b700f1000679731b22fcf07d5d823 100644 (file)
--- a/drivers/gpu/drm/drm_privacy_screen.c
+++ b/drivers/gpu/drm/drm_privacy_screen.c
@@ -387,7 +387,8 @@ static void drm_privacy_screen_device_release(struct device *dev)
  * * An ERR_PTR(errno) on failure.
  */
 struct drm_privacy_screen *drm_privacy_screen_register(
-       struct device *parent, const struct drm_privacy_screen_ops *ops)
+       struct device *parent, const struct drm_privacy_screen_ops *ops,
+       void *data)
 {
        struct drm_privacy_screen *priv;
        int ret;
@@ -404,6 +405,7 @@ struct drm_privacy_screen *drm_privacy_screen_register(
        priv->dev.parent = parent;
        priv->dev.release = drm_privacy_screen_device_release;
        dev_set_name(&priv->dev, "privacy_screen-%s", dev_name(parent));
+       priv->drvdata = data;
        priv->ops = ops;
 
        priv->ops->get_hw_state(priv);
@@ -439,6 +441,7 @@ void drm_privacy_screen_unregister(struct drm_privacy_screen *priv)
        mutex_unlock(&drm_privacy_screen_devs_lock);
 
        mutex_lock(&priv->lock);
+       priv->drvdata = NULL;
        priv->ops = NULL;
        mutex_unlock(&priv->lock);
 

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 341655d711ce95466d1bc37b18cc4fcdf4495108..ccbfda2b00953cfd101afddec8afbbb2cc62179b 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9782,7 +9782,7 @@ static int tpacpi_lcdshadow_init(struct ibm_init_struct *iibm)
                return 0;
 
        lcdshadow_dev = drm_privacy_screen_register(&tpacpi_pdev->dev,
-                                                   &lcdshadow_ops);
+                                                   &lcdshadow_ops, NULL);
        if (IS_ERR(lcdshadow_dev))
                return PTR_ERR(lcdshadow_dev);
 

diff --git a/include/drm/drm_privacy_screen_driver.h b/include/drm/drm_privacy_screen_driver.h
index 24591b6076755632150ed0e94613f96b3beb04d2..4ef246d5706f58b545c95991501d4c2b591cf5ad 100644 (file)
--- a/include/drm/drm_privacy_screen_driver.h
+++ b/include/drm/drm_privacy_screen_driver.h
@@ -73,10 +73,21 @@ struct drm_privacy_screen {
         * for more info.
         */
        enum drm_privacy_screen_status hw_state;
+       /**
+        * @drvdata: Private data owned by the privacy screen provider
+        */
+       void *drvdata;
 };
 
+static inline
+void *drm_privacy_screen_get_drvdata(struct drm_privacy_screen *priv)
+{
+       return priv->drvdata;
+}
+
 struct drm_privacy_screen *drm_privacy_screen_register(
-       struct device *parent, const struct drm_privacy_screen_ops *ops);
+       struct device *parent, const struct drm_privacy_screen_ops *ops,
+       void *data);
 void drm_privacy_screen_unregister(struct drm_privacy_screen *priv);
 
 void drm_privacy_screen_call_notifier_chain(struct drm_privacy_screen *priv);