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

Commit c11b8989 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.5-resolved' of... 

Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next

omapdrm changes for v4.5

* enable DRIVER_ATOMIC
* improved TILER performance
* cleanups preparing for DMAbuf import
* fbdev emulation is now optional
* minor fixes

* tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: remove obsolete manager assignment
  drm/omap: set DRIVER_ATOMIC for omapdrm
  drm/omap: remove unused plugin defines
  drm/omap: Use bitmaps for TILER placement
  drm: omapdrm: gem: Remove check for impossible condition
  drm: omapdrm: gem: Simplify error handling when creating GEM object
  drm: omapdrm: gem: Don't free mmap offset twice
  drm: omapdrm: gem: Fix GEM object destroy in error path
  drm: omapdrm: gem: Free the correct memory object
  drm: omapdrm: gem: Mask out private flags passed from userspace
  drm: omapdrm: gem: Move global usergart variable to omap_drm_private
  drm: omapdrm: gem: Group functions by purpose
  drm: omapdrm: gem: Remove forward declarations
  drm: omapdrm: gem: Remove unused function prototypes
  drm: omapdrm: Make fbdev emulation optional
  drm: omapdrm: Fix plane state free in plane reset handler
  drm: omapdrm: move omap_plane_reset()
  drm/omap: Use platform_register/unregister_drivers()
  drm: omapdrm: tiler: Remove unneded module alias for tiler
parents 54255e81 9c8e566e

drivers/gpu/drm/omapdrm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,10 +12,11 @@ omapdrm-y := omap_drv.o \ 
	omap_encoder.o \

	omap_connector.o \

	omap_fb.o \

	omap_fbdev.o \

	omap_gem.o \

	omap_gem_dmabuf.o \

	omap_dmm_tiler.o \

	tcm-sita.o



omapdrm-$(CONFIG_DRM_FBDEV_EMULATION) += omap_fbdev.o



obj-$(CONFIG_DRM_OMAP)	+= omapdrm.o

drivers/gpu/drm/omapdrm/omap_debugfs.c

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static int mm_show(struct seq_file *m, void *arg) 
	return drm_mm_dump_table(m, &dev->vma_offset_manager->vm_addr_space_mm);

}



#ifdef CONFIG_DRM_FBDEV_EMULATION

static int fb_show(struct seq_file *m, void *arg)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -73,12 +74,15 @@ static int fb_show(struct seq_file *m, void *arg) 


	return 0;

}

#endif



/* list of debufs files that are applicable to all devices */

static struct drm_info_list omap_debugfs_list[] = {

	{"gem", gem_show, 0},

	{"mm", mm_show, 0},

#ifdef CONFIG_DRM_FBDEV_EMULATION

	{"fb", fb_show, 0},

#endif

};



/* list of debugfs files that are specific to devices with dmm/tiler */

drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

+8 −7
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, 
	u32 min_align = 128;

	int ret;

	unsigned long flags;

	size_t slot_bytes;



	BUG_ON(!validfmt(fmt));
@@ -371,13 +372,15 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, 
	h = DIV_ROUND_UP(h, geom[fmt].slot_h);



	/* convert alignment to slots */

	min_align = max(min_align, (geom[fmt].slot_w * geom[fmt].cpp));

	align = ALIGN(align, min_align);

	align /= geom[fmt].slot_w * geom[fmt].cpp;

	slot_bytes = geom[fmt].slot_w * geom[fmt].cpp;

	min_align = max(min_align, slot_bytes);

	align = (align > min_align) ? ALIGN(align, min_align) : min_align;

	align /= slot_bytes;



	block->fmt = fmt;



	ret = tcm_reserve_2d(containers[fmt], w, h, align, &block->area);

	ret = tcm_reserve_2d(containers[fmt], w, h, align, -1, slot_bytes,

			&block->area);

	if (ret) {

		kfree(block);

		return ERR_PTR(-ENOMEM);
@@ -739,8 +742,7 @@ static int omap_dmm_probe(struct platform_device *dev) 
	   programming during reill operations */

	for (i = 0; i < omap_dmm->num_lut; i++) {

		omap_dmm->tcm[i] = sita_init(omap_dmm->container_width,

						omap_dmm->container_height,

						NULL);

						omap_dmm->container_height);



		if (!omap_dmm->tcm[i]) {

			dev_err(&dev->dev, "failed to allocate container\n");
@@ -1030,4 +1032,3 @@ struct platform_driver omap_dmm_driver = { 
MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Andy Gross <andy.gross@ti.com>");

MODULE_DESCRIPTION("OMAP DMM/Tiler Driver");
 
MODULE_ALIAS("platform:" DMM_DRIVER_NAME);

drivers/gpu/drm/omapdrm/omap_drv.c

+17 −27
Original line number Diff line number Diff line
@@ -547,14 +547,19 @@ static int ioctl_set_param(struct drm_device *dev, void *data, 
	return 0;

}



#define OMAP_BO_USER_MASK	0x00ffffff	/* flags settable by userspace */



static int ioctl_gem_new(struct drm_device *dev, void *data,

		struct drm_file *file_priv)

{

	struct drm_omap_gem_new *args = data;

	u32 flags = args->flags & OMAP_BO_USER_MASK;



	VERB("%p:%p: size=0x%08x, flags=%08x", dev, file_priv,

			args->size.bytes, args->flags);

	return omap_gem_new_handle(dev, file_priv, args->size,

			args->flags, &args->handle);

	     args->size.bytes, flags);



	return omap_gem_new_handle(dev, file_priv, args->size, flags,

				   &args->handle);

}



static int ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
@@ -692,10 +697,6 @@ static int dev_load(struct drm_device *dev, unsigned long flags) 
		drm_crtc_vblank_off(priv->crtcs[i]);



	priv->fbdev = omap_fbdev_init(dev);

	if (!priv->fbdev) {

		dev_warn(dev->dev, "omap_fbdev_init failed\n");

		/* well, limp along without an fbdev.. maybe X11 will work? */

	}



	/* store off drm_device for use in pm ops */

	dev_set_drvdata(dev->dev, dev);
@@ -831,7 +832,8 @@ static const struct file_operations omapdriver_fops = { 
};



static struct drm_driver omap_drm_driver = {

	.driver_features = DRIVER_MODESET | DRIVER_GEM  | DRIVER_PRIME,

	.driver_features = DRIVER_MODESET | DRIVER_GEM  | DRIVER_PRIME |

		DRIVER_ATOMIC,

	.load = dev_load,

	.unload = dev_unload,

	.open = dev_open,
@@ -928,35 +930,23 @@ static struct platform_driver pdev = { 
	.remove = pdev_remove,

};



static struct platform_driver * const drivers[] = {

	&omap_dmm_driver,

	&pdev,

};



static int __init omap_drm_init(void)

{

	int r;



	DBG("init");



	r = platform_driver_register(&omap_dmm_driver);

	if (r) {

		pr_err("DMM driver registration failed\n");

		return r;

	}



	r = platform_driver_register(&pdev);

	if (r) {

		pr_err("omapdrm driver registration failed\n");

		platform_driver_unregister(&omap_dmm_driver);

		return r;

	}



	return 0;

	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));

}



static void __exit omap_drm_fini(void)

{

	DBG("fini");



	platform_driver_unregister(&pdev);



	platform_driver_unregister(&omap_dmm_driver);

	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));

}



/* need late_initcall() so we load after dss_driver's are loaded */

drivers/gpu/drm/omapdrm/omap_drv.h

+12 −5
Original line number Diff line number Diff line
@@ -36,11 +36,7 @@ 


#define MODULE_NAME     "omapdrm"



/* max # of mapper-id's that can be assigned.. todo, come up with a better

 * (but still inexpensive) way to store/access per-buffer mapper private

 * data..

 */

#define MAX_MAPPERS 2

struct omap_drm_usergart;



/* parameters which describe (unrotated) coordinates of scanout within a fb: */

struct omap_drm_window {
@@ -97,6 +93,7 @@ struct omap_drm_private { 
	/* list of GEM objects: */

	struct list_head obj_list;



	struct omap_drm_usergart *usergart;

	bool has_dmm;



	/* properties: */
@@ -138,8 +135,18 @@ void omap_irq_unregister(struct drm_device *dev, struct omap_drm_irq *irq); 
void omap_drm_irq_uninstall(struct drm_device *dev);

int omap_drm_irq_install(struct drm_device *dev);



#ifdef CONFIG_DRM_FBDEV_EMULATION

struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev);

void omap_fbdev_free(struct drm_device *dev);

#else

static inline struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)

{

	return NULL;

}

static inline void omap_fbdev_free(struct drm_device *dev)

{

}

#endif



struct omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc);

enum omap_channel omap_crtc_channel(struct drm_crtc *crtc);