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

Commit 2d28b633 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.2-fixes' of... 

Merge tag 'omapdrm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-fixes

omapdrm fixes for 4.2

Small fixes for omapdrm, including:
* Fix packed 24 bit color formats
* Ensure the planes are inside the crtc
* Handle out-of-dma-memory error

* tag 'omapdrm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
  drm/omap: fix align_pitch() for 24 bits per pixel
  drm/omap: fix omap_gem_put_paddr() error handling
  drm/omap: fix omap_framebuffer_unpin() error handling
  drm/omap: increase DMM transaction timeout
  drm/omap: check that plane is inside crtc
  drm/omap: return error if dma_alloc_writecombine fails
parents 59e7a16d 743c1671

drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) 


	if (wait) {

		if (!wait_for_completion_timeout(&engine->compl,

				msecs_to_jiffies(1))) {

				msecs_to_jiffies(100))) {

			dev_err(dmm->dev, "timed out waiting for done\n");

			ret = -ETIMEDOUT;

		}

drivers/gpu/drm/omapdrm/omap_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
		struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);

struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p);

int omap_framebuffer_pin(struct drm_framebuffer *fb);

int omap_framebuffer_unpin(struct drm_framebuffer *fb);

void omap_framebuffer_unpin(struct drm_framebuffer *fb);

void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,

		struct omap_drm_window *win, struct omap_overlay_info *info);

struct drm_connector *omap_framebuffer_get_next_connector(
@@ -211,7 +211,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, 
		enum dma_data_direction dir);

int omap_gem_get_paddr(struct drm_gem_object *obj,

		dma_addr_t *paddr, bool remap);

int omap_gem_put_paddr(struct drm_gem_object *obj);

void omap_gem_put_paddr(struct drm_gem_object *obj);

int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages,

		bool remap);

int omap_gem_put_pages(struct drm_gem_object *obj);
@@ -236,7 +236,7 @@ static inline int align_pitch(int pitch, int width, int bpp) 
	/* PVR needs alignment to 8 pixels.. right now that is the most

	 * restrictive stride requirement..

	 */

	return ALIGN(pitch, 8 * bytespp);

	return roundup(pitch, 8 * bytespp);

}



/* map crtc to vblank mask */

drivers/gpu/drm/omapdrm/omap_fb.c

+4 −12
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ int omap_framebuffer_pin(struct drm_framebuffer *fb) 
}



/* unpin, no longer being scanned out: */

int omap_framebuffer_unpin(struct drm_framebuffer *fb)

void omap_framebuffer_unpin(struct drm_framebuffer *fb)

{

	struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);

	int ret, i, n = drm_format_num_planes(fb->pixel_format);

	int i, n = drm_format_num_planes(fb->pixel_format);



	mutex_lock(&omap_fb->lock);
@@ -298,24 +298,16 @@ int omap_framebuffer_unpin(struct drm_framebuffer *fb) 


	if (omap_fb->pin_count > 0) {

		mutex_unlock(&omap_fb->lock);

		return 0;

		return;

	}



	for (i = 0; i < n; i++) {

		struct plane *plane = &omap_fb->planes[i];

		ret = omap_gem_put_paddr(plane->bo);

		if (ret)

			goto fail;

		omap_gem_put_paddr(plane->bo);

		plane->paddr = 0;

	}



	mutex_unlock(&omap_fb->lock);



	return 0;



fail:

	mutex_unlock(&omap_fb->lock);

	return ret;

}



struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)

drivers/gpu/drm/omapdrm/omap_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, 
	fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;

	if (fbdev->ywrap_enabled) {

		/* need to align pitch to page size if using DMM scrolling */

		mode_cmd.pitches[0] = ALIGN(mode_cmd.pitches[0], PAGE_SIZE);

		mode_cmd.pitches[0] = PAGE_ALIGN(mode_cmd.pitches[0]);

	}



	/* allocate backing bo */

drivers/gpu/drm/omapdrm/omap_gem.c

+14 −12
Original line number Diff line number Diff line
@@ -808,10 +808,10 @@ int omap_gem_get_paddr(struct drm_gem_object *obj, 
/* Release physical address, when DMA is no longer being performed.. this

 * could potentially unpin and unmap buffers from TILER

 */

int omap_gem_put_paddr(struct drm_gem_object *obj)

void omap_gem_put_paddr(struct drm_gem_object *obj)

{

	struct omap_gem_object *omap_obj = to_omap_bo(obj);

	int ret = 0;

	int ret;



	mutex_lock(&obj->dev->struct_mutex);

	if (omap_obj->paddr_cnt > 0) {
@@ -821,7 +821,6 @@ int omap_gem_put_paddr(struct drm_gem_object *obj) 
			if (ret) {

				dev_err(obj->dev->dev,

					"could not unpin pages: %d\n", ret);

				goto fail;

			}

			ret = tiler_release(omap_obj->block);

			if (ret) {
@@ -832,9 +831,8 @@ int omap_gem_put_paddr(struct drm_gem_object *obj) 
			omap_obj->block = NULL;

		}

	}

fail:



	mutex_unlock(&obj->dev->struct_mutex);

	return ret;

}



/* Get rotated scanout address (only valid if already pinned), at the
@@ -1378,11 +1376,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, 


	omap_obj = kzalloc(sizeof(*omap_obj), GFP_KERNEL);

	if (!omap_obj)

		goto fail;



	spin_lock(&priv->list_lock);

	list_add(&omap_obj->mm_list, &priv->obj_list);

	spin_unlock(&priv->list_lock);

		return NULL;



	obj = &omap_obj->base;
@@ -1392,11 +1386,19 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, 
		 */

		omap_obj->vaddr =  dma_alloc_writecombine(dev->dev, size,

				&omap_obj->paddr, GFP_KERNEL);

		if (omap_obj->vaddr)

			flags |= OMAP_BO_DMA;

		if (!omap_obj->vaddr) {

			kfree(omap_obj);



			return NULL;

		}



		flags |= OMAP_BO_DMA;

	}



	spin_lock(&priv->list_lock);

	list_add(&omap_obj->mm_list, &priv->obj_list);

	spin_unlock(&priv->list_lock);



	omap_obj->flags = flags;



	if (flags & OMAP_BO_TILED) {