diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-07-27 12:48:17 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-07-27 12:48:17 +0200 |
| commit | ca31fef11dc83e672415d5925a134749761329bd (patch) | |
| tree | 8eb6a489e2d6dd117300f40ed8fc945a06bb6eee /drivers/gpu/drm/drm_auth.c | |
| parent | drm/plane: Move drm_plane_enable_fb_damage_clips into core (diff) | |
| parent | efi: sysfb_efi: fix build when EFI is not set (diff) | |
| download | linux-rng-ca31fef11dc83e672415d5925a134749761329bd.tar.xz linux-rng-ca31fef11dc83e672415d5925a134749761329bd.zip | |
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
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 f00354bec3fb..3a64a6a79ade 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -349,9 +349,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); |