diff options
| author |   Michel Dänzer <michel.daenzer@amd.com> | 2017-09-11 17:09:17 +0900 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-09-13 12:10:12 -0400 |
| commit | e97f12f359775de4fabfb507f836ebffa20f4986 (patch) | |
| tree | 7ffe6d4de9b810551f7f0da34c478ae1de0c91be | |
| parent | amdgpu: Only destroy fbdev framebuffer if it was initialized (diff) | |
| download | wireguard-linux-e97f12f359775de4fabfb507f836ebffa20f4986.tar.xz wireguard-linux-e97f12f359775de4fabfb507f836ebffa20f4986.zip | |
radeon: Only destroy fbdev framebuffer if it was initialized
Fixes crash when trying to unload the radeon module before the fbdev
framebuffer was initialized, which can happen since the DRM fbdev helper
code supports deferred setup.
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index fd25361ac681..2fcf805d3a16 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -322,10 +322,10 @@ static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfb if (rfb->obj) { radeonfb_destroy_pinned_object(rfb->obj); rfb->obj = NULL; + drm_framebuffer_unregister_private(&rfb->base); + drm_framebuffer_cleanup(&rfb->base); } drm_fb_helper_fini(&rfbdev->helper); - drm_framebuffer_unregister_private(&rfb->base); - drm_framebuffer_cleanup(&rfb->base); return 0; } |