Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox...
authorDave Airlie <airlied@redhat.com>
Thu, 12 Dec 2013 00:40:19 +0000 (10:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Dec 2013 00:40:19 +0000 (10:40 +1000)
These four patches fix a few issues discovered since the initial merge,
which have been reviewed by Rob Clark and Thierry Reding.

* 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  DRM: Armada: prime refcounting bug fix
  DRM: Armada: fix printing of phys_addr_t/dma_addr_t
  DRM: Armada: destroy framebuffer after helper
  DRM: Armada: implement lastclose() for fbhelper

1  2 
drivers/gpu/drm/armada/armada_drv.c

@@@ -321,6 -321,11 +321,11 @@@ static struct drm_ioctl_desc armada_ioc
                DRM_UNLOCKED),
  };
  
+ static void armada_drm_lastclose(struct drm_device *dev)
+ {
+       armada_fbdev_lastclose(dev);
+ }
  static const struct file_operations armada_drm_fops = {
        .owner                  = THIS_MODULE,
        .llseek                 = no_llseek,
@@@ -337,7 -342,7 +342,7 @@@ static struct drm_driver armada_drm_dri
        .open                   = NULL,
        .preclose               = NULL,
        .postclose              = NULL,
-       .lastclose              = NULL,
+       .lastclose              = armada_drm_lastclose,
        .unload                 = armada_drm_unload,
        .get_vblank_counter     = drm_vblank_count,
        .enable_vblank          = armada_drm_enable_vblank,
        .debugfs_init           = armada_drm_debugfs_init,
        .debugfs_cleanup        = armada_drm_debugfs_cleanup,
  #endif
 -      .gem_init_object        = NULL,
        .gem_free_object        = armada_gem_free_object,
        .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
        .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,