Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c015db7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-fixes 

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
parents 25945b66 5cd52688

drivers/gpu/drm/armada/armada_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void armada_drm_queue_unref_work(struct drm_device *, 
extern const struct drm_mode_config_funcs armada_drm_mode_config_funcs;



int armada_fbdev_init(struct drm_device *);

void armada_fbdev_lastclose(struct drm_device *);

void armada_fbdev_fini(struct drm_device *);



int armada_overlay_plane_create(struct drm_device *, unsigned long);

drivers/gpu/drm/armada/armada_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -321,6 +321,11 @@ static struct drm_ioctl_desc armada_ioctls[] = { 
		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 @@ static struct drm_driver armada_drm_driver = { 
	.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,

drivers/gpu/drm/armada/armada_fbdev.c

+15 −5
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ static int armada_fb_create(struct drm_fb_helper *fbh, 
	drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], dfb->fb.depth);

	drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);



	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08x\n",

		dfb->fb.width, dfb->fb.height,

		dfb->fb.bits_per_pixel, obj->phys_addr);

	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",

		dfb->fb.width, dfb->fb.height, dfb->fb.bits_per_pixel,

		(unsigned long long)obj->phys_addr);



	return 0;
@@ -177,6 +177,16 @@ int armada_fbdev_init(struct drm_device *dev) 
	return ret;

}



void armada_fbdev_lastclose(struct drm_device *dev)

{

	struct armada_private *priv = dev->dev_private;



	drm_modeset_lock_all(dev);

	if (priv->fbdev)

		drm_fb_helper_restore_fbdev_mode(priv->fbdev);

	drm_modeset_unlock_all(dev);

}



void armada_fbdev_fini(struct drm_device *dev)

{

	struct armada_private *priv = dev->dev_private;
@@ -192,11 +202,11 @@ void armada_fbdev_fini(struct drm_device *dev) 
			framebuffer_release(info);

		}



		drm_fb_helper_fini(fbh);



		if (fbh->fb)

			fbh->fb->funcs->destroy(fbh->fb);



		drm_fb_helper_fini(fbh);



		priv->fbdev = NULL;

	}

}

drivers/gpu/drm/armada/armada_gem.c

+4 −3
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj) 
		obj->dev_addr = obj->linear->start;

	}



	DRM_DEBUG_DRIVER("obj %p phys %#x dev %#x\n",

			 obj, obj->phys_addr, obj->dev_addr);

	DRM_DEBUG_DRIVER("obj %p phys %#llx dev %#llx\n", obj,

			 (unsigned long long)obj->phys_addr,

			 (unsigned long long)obj->dev_addr);



	return 0;

}
@@ -557,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) 
			 * refcount on the gem object itself.

			 */

			drm_gem_object_reference(obj);

			dma_buf_put(buf);

			return obj;

		}

	}
@@ -573,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) 
	}



	dobj->obj.import_attach = attach;

	get_dma_buf(buf);



	/*

	 * Don't call dma_buf_map_attachment() here - it maps the