Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / msm_drv.c

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index b4cfa44a8a5c479618d8e92fa871fbad42b1b929..891eff8433a9cd691daa0b989da7fbfaf38cec8e 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -449,18 +449,18 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        if (ret)
                goto err_cleanup_mode_config;
 
+       dma_set_max_seg_size(dev, UINT_MAX);
+
        /* Bind all our sub-components: */
        ret = component_bind_all(dev, ddev);
        if (ret)
                goto err_deinit_vram;
 
        /* the fw fb could be anywhere in memory */
-       ret = drm_aperture_remove_framebuffers(false, drv);
+       ret = drm_aperture_remove_framebuffers(drv);
        if (ret)
                goto err_msm_uninit;
 
-       dma_set_max_seg_size(dev, UINT_MAX);
-
        msm_gem_shrinker_init(ddev);
 
        if (priv->kms_init) {
@@ -1057,23 +1057,23 @@ static const struct drm_ioctl_desc msm_ioctls[] = {
        DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW),
 };
 
-static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f)
+static void msm_show_fdinfo(struct drm_printer *p, struct drm_file *file)
 {
-       struct drm_file *file = f->private_data;
        struct drm_device *dev = file->minor->dev;
        struct msm_drm_private *priv = dev->dev_private;
-       struct drm_printer p = drm_seq_file_printer(m);
 
        if (!priv->gpu)
                return;
 
-       msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, &p);
+       msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, p);
+
+       drm_show_memory_stats(p, file);
 }
 
 static const struct file_operations fops = {
        .owner = THIS_MODULE,
        DRM_GEM_FOPS,
-       .show_fdinfo = msm_fop_show_fdinfo,
+       .show_fdinfo = drm_show_fdinfo,
 };
 
 static const struct drm_driver msm_driver = {
@@ -1083,7 +1083,7 @@ static const struct drm_driver msm_driver = {
                                DRIVER_MODESET |
                                DRIVER_SYNCOBJ,
        .open               = msm_open,
-       .postclose           = msm_postclose,
+       .postclose          = msm_postclose,
        .dumb_create        = msm_gem_dumb_create,
        .dumb_map_offset    = msm_gem_dumb_map_offset,
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
@@ -1093,6 +1093,7 @@ static const struct drm_driver msm_driver = {
 #ifdef CONFIG_DEBUG_FS
        .debugfs_init       = msm_debugfs_init,
 #endif
+       .show_fdinfo        = msm_show_fdinfo,
        .ioctls             = msm_ioctls,
        .num_ioctls         = ARRAY_SIZE(msm_ioctls),
        .fops               = &fops,