Skip to content

Commit

Permalink
drm/fsl-dcu: deallocate fbdev CMA on unload
Browse files Browse the repository at this point in the history
Free fbdev CMA using drm_fbdev_cma_fini on unload. This fixes
a warning when unloading the driver:
WARNING: CPU: 0 PID: 164 at drivers/gpu/drm/drm_crtc.c:5930 drm_mode_config_cleanup+0x204/0x208

Signed-off-by: Stefan Agner <stefan@agner.ch>
  • Loading branch information
Stefan Agner committed Apr 26, 2016
1 parent b617966 commit afb49e4
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h>

#include "fsl_dcu_drm_crtc.h"
Expand Down Expand Up @@ -90,6 +91,9 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)

return 0;
done:
if (fsl_dev->fbdev)
drm_fbdev_cma_fini(fsl_dev->fbdev);

drm_mode_config_cleanup(dev);
drm_vblank_cleanup(dev);
drm_irq_uninstall(dev);
Expand All @@ -100,6 +104,11 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)

static int fsl_dcu_unload(struct drm_device *dev)
{
struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;

if (fsl_dev->fbdev)
drm_fbdev_cma_fini(fsl_dev->fbdev);

drm_mode_config_cleanup(dev);
drm_vblank_cleanup(dev);
drm_irq_uninstall(dev);
Expand Down

0 comments on commit afb49e4

Please sign in to comment.