diff options
author | Dave Airlie <airlied@redhat.com> | 2023-02-23 02:32:10 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-02-23 02:32:41 +0300 |
commit | 13daf536191e8c484fa21de8fcac4767f7b66e80 (patch) | |
tree | 57851eec1aa14cd32ef0b3c8ee8d2878baca28a4 /drivers/gpu/drm/i915 | |
parent | 5582f3c1b14e9b6eb02983acac84a4da71b38ca9 (diff) | |
parent | 3fb1f62f80a1d249260db5ea9e22c51e52fab9ae (diff) | |
download | linux-13daf536191e8c484fa21de8fcac4767f7b66e80.tar.xz |
Merge tag 'drm-misc-next-fixes-2023-02-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
Fixes GEM SHMEM locking and generic fbdev hotplugging. Constifies
dma_buf kobj type.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y/S6tu3gdQ0VizR+@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index 4d761c8d42ab..9863963daeca 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -340,6 +340,7 @@ static void intel_fbdev_destroy(struct intel_fbdev *ifbdev) if (ifbdev->fb) drm_framebuffer_remove(&ifbdev->fb->base); + drm_fb_helper_unprepare(&ifbdev->helper); kfree(ifbdev); } |