diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-06-11 10:59:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-06-11 10:59:55 +1000 |
| commit | 750643a99e6774e65028201a54cf621d5e43dc9c (patch) | |
| tree | 4a63d8fe05168f819346ed76a02836a2b3a8cfa3 /drivers/gpu/drm/drm_auth.c | |
| parent | 43f44f5bd1970fafb259152e1c9d8e6daf0f362d (diff) | |
| parent | c336a5ee984708db4826ef9e47d184e638e29717 (diff) | |
Merge tag 'drm-misc-fixes-2021-06-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
One fix for snu4i that prevents it from probing, two locking fixes for
ttm and drm_auth, one off-by-x1000 fix for mcde and a fix for vc4 to
prevent an out-of-bounds access.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210610171653.lqsoadxrhdk73cdy@gilmour
Diffstat (limited to 'drivers/gpu/drm/drm_auth.c')
| -rw-r--r-- | drivers/gpu/drm/drm_auth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index f2d46b7ac6f9..232abbba3686 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -314,9 +314,10 @@ int drm_master_open(struct drm_file *file_priv) void drm_master_release(struct drm_file *file_priv) { struct drm_device *dev = file_priv->minor->dev; - struct drm_master *master = file_priv->master; + struct drm_master *master; mutex_lock(&dev->master_mutex); + master = file_priv->master; if (file_priv->magic) idr_remove(&file_priv->master->magic_map, file_priv->magic); |