leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/privacy_screen: Add drvdata in drm_privacy_screen

Browse Source 
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
This commit is contained in:
Rajat Jain 2022-01-07 11:02:06 -08:00 committed by Hans de Goede
parent 3dbc84a595
commit 30598d925d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/drm_privacy_screen.c
View File

@ -387,7 +387,8 @@ static void drm_privacy_screen_device_release(struct device *dev)
* * An ERR_PTR(errno) on failure. * * An ERR_PTR(errno) on failure.
*/ */
struct drm_privacy_screen *drm_privacy_screen_register( 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; struct drm_privacy_screen *priv;
int ret; int ret;
@ -404,6 +405,7 @@ struct drm_privacy_screen *drm_privacy_screen_register(
priv->dev.parent = parent; priv->dev.parent = parent;
priv->dev.release = drm_privacy_screen_device_release; priv->dev.release = drm_privacy_screen_device_release;
dev_set_name(&priv->dev, "privacy_screen-%s", dev_name(parent)); dev_set_name(&priv->dev, "privacy_screen-%s", dev_name(parent));
priv->drvdata = data;
priv->ops = ops; priv->ops = ops;
priv->ops->get_hw_state(priv); 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_unlock(&drm_privacy_screen_devs_lock);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
priv->drvdata = NULL;
priv->ops = NULL; priv->ops = NULL;
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);

2
drivers/platform/x86/thinkpad_acpi.c
View File

@ -9782,7 +9782,7 @@ static int tpacpi_lcdshadow_init(struct ibm_init_struct *iibm)
return 0; return 0;
lcdshadow_dev = drm_privacy_screen_register(&tpacpi_pdev->dev, lcdshadow_dev = drm_privacy_screen_register(&tpacpi_pdev->dev,
&lcdshadow_ops); &lcdshadow_ops, NULL);
if (IS_ERR(lcdshadow_dev)) if (IS_ERR(lcdshadow_dev))
return PTR_ERR(lcdshadow_dev); return PTR_ERR(lcdshadow_dev);

13
include/drm/drm_privacy_screen_driver.h
View File

@ -73,10 +73,21 @@ struct drm_privacy_screen {
* for more info. * for more info.
*/ */
enum drm_privacy_screen_status hw_state; 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 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_unregister(struct drm_privacy_screen *priv);
void drm_privacy_screen_call_notifier_chain(struct drm_privacy_screen *priv); void drm_privacy_screen_call_notifier_chain(struct drm_privacy_screen *priv);