| Message ID | 20211220222828.2625444-1-rajatja@google.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [v3,1/3] drm/privacy_screen: Add drvdata in drm_privacy_screen | expand |
Hi, On 12/20/21 23:28, Rajat Jain wrote: > 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> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > v3: Initial version. Came up due to review comments on v2 of other patches. > v2: No v2 > v1: No v1 > > drivers/gpu/drm/drm_privacy_screen.c | 5 ++++- > drivers/platform/x86/thinkpad_acpi.c | 2 +- > include/drm/drm_privacy_screen_driver.h | 13 ++++++++++++- > 3 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_privacy_screen.c b/drivers/gpu/drm/drm_privacy_screen.c > index beaf99e9120a..03b149cc455b 100644 > --- 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 341655d711ce..ccbfda2b0095 100644 > --- 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 24591b607675..4ef246d5706f 100644 > --- 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); >
diff --git a/drivers/gpu/drm/drm_privacy_screen.c b/drivers/gpu/drm/drm_privacy_screen.c index beaf99e9120a..03b149cc455b 100644 --- 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 341655d711ce..ccbfda2b0095 100644 --- 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 24591b607675..4ef246d5706f 100644 --- 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);
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> --- v3: Initial version. Came up due to review comments on v2 of other patches. v2: No v2 v1: No v1 drivers/gpu/drm/drm_privacy_screen.c | 5 ++++- drivers/platform/x86/thinkpad_acpi.c | 2 +- include/drm/drm_privacy_screen_driver.h | 13 ++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-)