Backmerge tag 'v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_privacy_screen.c

diff --git a/drivers/gpu/drm/drm_privacy_screen.c b/drivers/gpu/drm/drm_privacy_screen.c
index b688841..2b082e5 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);