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

Commit 4cf73129 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next 

-next reported a messy merge, so I've merged my upstream pull into
my -next tree.

Conflicts:
	drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
parents 3e54f5b7 6abff3c7

MAINTAINERS

+9 −4
Original line number Diff line number Diff line
@@ -3101,6 +3101,7 @@ F: include/linux/hid* 


HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Maintained

F:	Documentation/timers/

F:	kernel/hrtimer.c
@@ -3610,7 +3611,7 @@ F: net/irda/ 
IRQ SUBSYSTEM

M:	Thomas Gleixner <tglx@linutronix.de>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	kernel/irq/



ISAPNP
@@ -4098,7 +4099,7 @@ F: drivers/hwmon/lm90.c 
LOCKDEP AND LOCKSTAT

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking

S:	Maintained

F:	Documentation/lockdep*.txt

F:	Documentation/lockstat.txt
@@ -5086,6 +5087,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl> 
M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core

S:	Supported

F:	kernel/events/*

F:	include/linux/perf_event.h
@@ -5165,6 +5167,7 @@ F: drivers/scsi/pm8001/ 


POSIX CLOCKS and TIMERS

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

F:	fs/timerfd.c

F:	include/linux/timer*
@@ -5680,6 +5683,7 @@ F: drivers/dma/dw_dmac.c 
TIMEKEEPING, NTP

M:	John Stultz <johnstul@us.ibm.com>

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

F:	include/linux/clocksource.h

F:	include/linux/time.h
@@ -5704,6 +5708,7 @@ F: drivers/watchdog/sc1200wdt.c 
SCHEDULER

M:	Ingo Molnar <mingo@elte.hu>

M:	Peter Zijlstra <peterz@infradead.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core

S:	Maintained

F:	kernel/sched*

F:	include/linux/sched.h
@@ -6631,7 +6636,7 @@ TRACING 
M:	Steven Rostedt <rostedt@goodmis.org>

M:	Frederic Weisbecker <fweisbec@gmail.com>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core

S:	Maintained

F:	Documentation/trace/ftrace.txt

F:	arch/*/*/*/ftrace.h
@@ -7381,7 +7386,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
M:	Ingo Molnar <mingo@redhat.com>

M:	"H. Peter Anvin" <hpa@zytor.com>

M:	x86@kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core

S:	Maintained

F:	Documentation/x86/

F:	arch/x86/

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -390,6 +390,11 @@ extern int vmw_context_check(struct vmw_private *dev_priv, 
			     struct ttm_object_file *tfile,

			     int id,

			     struct vmw_resource **p_res);

extern int vmw_user_lookup_handle(struct vmw_private *dev_priv,

				  struct ttm_object_file *tfile,

				  uint32_t handle,

				  struct vmw_surface **out_surf,

				  struct vmw_dma_buffer **out_buf);

extern void vmw_surface_res_free(struct vmw_resource *res);

extern int vmw_surface_init(struct vmw_private *dev_priv,

			    struct vmw_surface *srf,

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+7 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) 
{

	__le32 __iomem *fifo_mem = dev_priv->mmio_virt;

	uint32_t fifo_min, hwversion;

	const struct vmw_fifo_state *fifo = &dev_priv->fifo;



	if (!(dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO))

		return false;
@@ -41,7 +42,12 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) 
	if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int))

		return false;



	hwversion = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);

	hwversion = ioread32(fifo_mem +

			     ((fifo->capabilities &

			       SVGA_FIFO_CAP_3D_HWVERSION_REVISED) ?

			      SVGA_FIFO_3D_HWVERSION_REVISED :

			      SVGA_FIFO_3D_HWVERSION));



	if (hwversion == 0)

		return false;

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

+8 −8
Original line number Diff line number Diff line
@@ -58,8 +58,14 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 
	case DRM_VMW_PARAM_FIFO_HW_VERSION:

	{

		__le32 __iomem *fifo_mem = dev_priv->mmio_virt;



		param->value = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);

		const struct vmw_fifo_state *fifo = &dev_priv->fifo;



		param->value =

			ioread32(fifo_mem +

				 ((fifo->capabilities &

				   SVGA_FIFO_CAP_3D_HWVERSION_REVISED) ?

				  SVGA_FIFO_3D_HWVERSION_REVISED :

				  SVGA_FIFO_3D_HWVERSION));

		break;

	}

	default:
@@ -166,13 +172,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data, 
		ret = -EINVAL;

		goto out_no_fb;

	}



	vfb = vmw_framebuffer_to_vfb(obj_to_fb(obj));

	if (!vfb->dmabuf) {

		DRM_ERROR("Framebuffer not dmabuf backed.\n");

		ret = -EINVAL;

		goto out_no_fb;

	}



	ret = ttm_read_lock(&vmaster->lock, true);

	if (unlikely(ret != 0))

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+249 −141
Original line number Diff line number Diff line
@@ -31,6 +31,44 @@ 
/* Might need a hrtimer here? */

#define VMWGFX_PRESENT_RATE ((HZ / 60 > 0) ? HZ / 60 : 1)





struct vmw_clip_rect {

	int x1, x2, y1, y2;

};



/**

 * Clip @num_rects number of @rects against @clip storing the

 * results in @out_rects and the number of passed rects in @out_num.

 */

void vmw_clip_cliprects(struct drm_clip_rect *rects,

			int num_rects,

			struct vmw_clip_rect clip,

			SVGASignedRect *out_rects,

			int *out_num)

{

	int i, k;



	for (i = 0, k = 0; i < num_rects; i++) {

		int x1 = max_t(int, clip.x1, rects[i].x1);

		int y1 = max_t(int, clip.y1, rects[i].y1);

		int x2 = min_t(int, clip.x2, rects[i].x2);

		int y2 = min_t(int, clip.y2, rects[i].y2);



		if (x1 >= x2)

			continue;

		if (y1 >= y2)

			continue;



		out_rects[k].left   = x1;

		out_rects[k].top    = y1;

		out_rects[k].right  = x2;

		out_rects[k].bottom = y2;

		k++;

	}



	*out_num = k;

}



void vmw_display_unit_cleanup(struct vmw_display_unit *du)

{

	if (du->cursor_surface)
@@ -82,6 +120,43 @@ int vmw_cursor_update_image(struct vmw_private *dev_priv, 
	return 0;

}



int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv,

			     struct vmw_dma_buffer *dmabuf,

			     u32 width, u32 height,

			     u32 hotspotX, u32 hotspotY)

{

	struct ttm_bo_kmap_obj map;

	unsigned long kmap_offset;

	unsigned long kmap_num;

	void *virtual;

	bool dummy;

	int ret;



	kmap_offset = 0;

	kmap_num = (width*height*4 + PAGE_SIZE - 1) >> PAGE_SHIFT;



	ret = ttm_bo_reserve(&dmabuf->base, true, false, false, 0);

	if (unlikely(ret != 0)) {

		DRM_ERROR("reserve failed\n");

		return -EINVAL;

	}



	ret = ttm_bo_kmap(&dmabuf->base, kmap_offset, kmap_num, &map);

	if (unlikely(ret != 0))

		goto err_unreserve;



	virtual = ttm_kmap_obj_virtual(&map, &dummy);

	ret = vmw_cursor_update_image(dev_priv, virtual, width, height,

				      hotspotX, hotspotY);



	ttm_bo_kunmap(&map);

err_unreserve:

	ttm_bo_unreserve(&dmabuf->base);



	return ret;

}





void vmw_cursor_update_position(struct vmw_private *dev_priv,

				bool show, int x, int y)

{
@@ -110,22 +185,19 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, 
		return -EINVAL;



	if (handle) {

		ret = vmw_user_surface_lookup_handle(dev_priv, tfile,

						     handle, &surface);

		if (!ret) {

			if (!surface->snooper.image) {

				DRM_ERROR("surface not suitable for cursor\n");

				vmw_surface_unreference(&surface);

				return -EINVAL;

			}

		} else {

			ret = vmw_user_dmabuf_lookup(tfile,

						     handle, &dmabuf);

		ret = vmw_user_lookup_handle(dev_priv, tfile,

					     handle, &surface, &dmabuf);

		if (ret) {

			DRM_ERROR("failed to find surface or dmabuf: %i\n", ret);

			return -EINVAL;

		}

	}



	/* need to do this before taking down old image */

	if (surface && !surface->snooper.image) {

		DRM_ERROR("surface not suitable for cursor\n");

		vmw_surface_unreference(&surface);

		return -EINVAL;

	}



	/* takedown old cursor */
@@ -146,36 +218,11 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, 
		vmw_cursor_update_image(dev_priv, surface->snooper.image,

					64, 64, du->hotspot_x, du->hotspot_y);

	} else if (dmabuf) {

		struct ttm_bo_kmap_obj map;

		unsigned long kmap_offset;

		unsigned long kmap_num;

		void *virtual;

		bool dummy;



		/* vmw_user_surface_lookup takes one reference */

		du->cursor_dmabuf = dmabuf;



		kmap_offset = 0;

		kmap_num = (64*64*4) >> PAGE_SHIFT;



		ret = ttm_bo_reserve(&dmabuf->base, true, false, false, 0);

		if (unlikely(ret != 0)) {

			DRM_ERROR("reserve failed\n");

			return -EINVAL;

		}



		ret = ttm_bo_kmap(&dmabuf->base, kmap_offset, kmap_num, &map);

		if (unlikely(ret != 0))

			goto err_unreserve;



		virtual = ttm_kmap_obj_virtual(&map, &dummy);

		vmw_cursor_update_image(dev_priv, virtual, 64, 64,

		ret = vmw_cursor_update_dmabuf(dev_priv, dmabuf, width, height,

					       du->hotspot_x, du->hotspot_y);



		ttm_bo_kunmap(&map);

err_unreserve:

		ttm_bo_unreserve(&dmabuf->base);



	} else {

		vmw_cursor_update_position(dev_priv, false, 0, 0);

		return 0;
@@ -377,8 +424,9 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv, 
				struct drm_clip_rect *clips,

				unsigned num_clips, int inc)

{

	struct drm_clip_rect *clips_ptr;

	struct vmw_display_unit *units[VMWGFX_NUM_DISPLAY_UNITS];

	struct drm_clip_rect *clips_ptr;

	struct drm_clip_rect *tmp;

	struct drm_crtc *crtc;

	size_t fifo_size;

	int i, num_units;
@@ -391,7 +439,6 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv, 
	} *cmd;

	SVGASignedRect *blits;





	num_units = 0;

	list_for_each_entry(crtc, &dev_priv->dev->mode_config.crtc_list,

			    head) {
@@ -402,13 +449,24 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv, 


	BUG_ON(!clips || !num_clips);



	tmp = kzalloc(sizeof(*tmp) * num_clips, GFP_KERNEL);

	if (unlikely(tmp == NULL)) {

		DRM_ERROR("Temporary cliprect memory alloc failed.\n");

		return -ENOMEM;

	}



	fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num_clips;

	cmd = kzalloc(fifo_size, GFP_KERNEL);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Temporary fifo memory alloc failed.\n");

		return -ENOMEM;

		ret = -ENOMEM;

		goto out_free_tmp;

	}



	/* setup blits pointer */

	blits = (SVGASignedRect *)&cmd[1];



	/* initial clip region */

	left = clips->x1;

	right = clips->x2;

	top = clips->y1;
@@ -434,45 +492,60 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv, 
	cmd->body.srcRect.bottom = bottom;



	clips_ptr = clips;

	blits = (SVGASignedRect *)&cmd[1];

	for (i = 0; i < num_clips; i++, clips_ptr += inc) {

		blits[i].left   = clips_ptr->x1 - left;

		blits[i].right  = clips_ptr->x2 - left;

		blits[i].top    = clips_ptr->y1 - top;

		blits[i].bottom = clips_ptr->y2 - top;

		tmp[i].x1 = clips_ptr->x1 - left;

		tmp[i].x2 = clips_ptr->x2 - left;

		tmp[i].y1 = clips_ptr->y1 - top;

		tmp[i].y2 = clips_ptr->y2 - top;

	}



	/* do per unit writing, reuse fifo for each */

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

		struct vmw_display_unit *unit = units[i];

		int clip_x1 = left - unit->crtc.x;

		int clip_y1 = top - unit->crtc.y;

		int clip_x2 = right - unit->crtc.x;

		int clip_y2 = bottom - unit->crtc.y;

		struct vmw_clip_rect clip;

		int num;



		clip.x1 = left - unit->crtc.x;

		clip.y1 = top - unit->crtc.y;

		clip.x2 = right - unit->crtc.x;

		clip.y2 = bottom - unit->crtc.y;



		/* skip any crtcs that misses the clip region */

		if (clip_x1 >= unit->crtc.mode.hdisplay ||

		    clip_y1 >= unit->crtc.mode.vdisplay ||

		    clip_x2 <= 0 || clip_y2 <= 0)

		if (clip.x1 >= unit->crtc.mode.hdisplay ||

		    clip.y1 >= unit->crtc.mode.vdisplay ||

		    clip.x2 <= 0 || clip.y2 <= 0)

			continue;



		/*

		 * In order for the clip rects to be correctly scaled

		 * the src and dest rects needs to be the same size.

		 */

		cmd->body.destRect.left = clip.x1;

		cmd->body.destRect.right = clip.x2;

		cmd->body.destRect.top = clip.y1;

		cmd->body.destRect.bottom = clip.y2;



		/* create a clip rect of the crtc in dest coords */

		clip.x2 = unit->crtc.mode.hdisplay - clip.x1;

		clip.y2 = unit->crtc.mode.vdisplay - clip.y1;

		clip.x1 = 0 - clip.x1;

		clip.y1 = 0 - clip.y1;



		/* need to reset sid as it is changed by execbuf */

		cmd->body.srcImage.sid = cpu_to_le32(framebuffer->user_handle);



		cmd->body.destScreenId = unit->unit;



		/*

		 * The blit command is a lot more resilient then the

		 * readback command when it comes to clip rects. So its

		 * okay to go out of bounds.

		 */

		/* clip and write blits to cmd stream */

		vmw_clip_cliprects(tmp, num_clips, clip, blits, &num);



		cmd->body.destRect.left = clip_x1;

		cmd->body.destRect.right = clip_x2;

		cmd->body.destRect.top = clip_y1;

		cmd->body.destRect.bottom = clip_y2;

		/* if no cliprects hit skip this */

		if (num == 0)

			continue;





		/* recalculate package length */

		fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num;

		cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header));

		ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,

					  fifo_size, 0, NULL);
@@ -480,7 +553,10 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv, 
			break;

	}





	kfree(cmd);

out_free_tmp:

	kfree(tmp);



	return ret;

}
@@ -556,6 +632,10 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv, 
	 * Sanity checks.

	 */



	/* Surface must be marked as a scanout. */

	if (unlikely(!surface->scanout))

		return -EINVAL;



	if (unlikely(surface->mip_levels[0] != 1 ||

		     surface->num_sizes != 1 ||

		     surface->sizes[0].width < mode_cmd->width ||
@@ -782,6 +862,7 @@ static int do_dmabuf_dirty_sou(struct drm_file *file_priv, 
			int clip_y1 = clips_ptr->y1 - unit->crtc.y;

			int clip_x2 = clips_ptr->x2 - unit->crtc.x;

			int clip_y2 = clips_ptr->y2 - unit->crtc.y;

			int move_x, move_y;



			/* skip any crtcs that misses the clip region */

			if (clip_x1 >= unit->crtc.mode.hdisplay ||
@@ -789,12 +870,21 @@ static int do_dmabuf_dirty_sou(struct drm_file *file_priv, 
			    clip_x2 <= 0 || clip_y2 <= 0)

				continue;



			/* clip size to crtc size */

			clip_x2 = min_t(int, clip_x2, unit->crtc.mode.hdisplay);

			clip_y2 = min_t(int, clip_y2, unit->crtc.mode.vdisplay);



			/* translate both src and dest to bring clip into screen */

			move_x = min_t(int, clip_x1, 0);

			move_y = min_t(int, clip_y1, 0);



			/* actual translate done here */

			blits[hit_num].header = SVGA_CMD_BLIT_GMRFB_TO_SCREEN;

			blits[hit_num].body.destScreenId = unit->unit;

			blits[hit_num].body.srcOrigin.x = clips_ptr->x1;

			blits[hit_num].body.srcOrigin.y = clips_ptr->y1;

			blits[hit_num].body.destRect.left = clip_x1;

			blits[hit_num].body.destRect.top = clip_y1;

			blits[hit_num].body.srcOrigin.x = clips_ptr->x1 - move_x;

			blits[hit_num].body.srcOrigin.y = clips_ptr->y1 - move_y;

			blits[hit_num].body.destRect.left = clip_x1 - move_x;

			blits[hit_num].body.destRect.top = clip_y1 - move_y;

			blits[hit_num].body.destRect.right = clip_x2;

			blits[hit_num].body.destRect.bottom = clip_y2;

			hit_num++;
@@ -1045,42 +1135,29 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, 
	 * End conditioned code.

	 */



	ret = vmw_user_surface_lookup_handle(dev_priv, tfile,

					     mode_cmd.handle, &surface);

	/* returns either a dmabuf or surface */

	ret = vmw_user_lookup_handle(dev_priv, tfile,

				     mode_cmd.handle,

				     &surface, &bo);

	if (ret)

		goto try_dmabuf;



	if (!surface->scanout)

		goto err_not_scanout;



	ret = vmw_kms_new_framebuffer_surface(dev_priv, file_priv, surface,

					      &vfb, &mode_cmd);



	/* vmw_user_surface_lookup takes one ref so does new_fb */

	vmw_surface_unreference(&surface);



	if (ret) {

		DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);

		ttm_base_object_unref(&user_obj);

		return ERR_PTR(ret);

	} else

		vfb->user_obj = user_obj;

	return &vfb->base;



try_dmabuf:

	DRM_INFO("%s: trying buffer\n", __func__);



	ret = vmw_user_dmabuf_lookup(tfile, mode_cmd.handle, &bo);

	if (ret) {

		DRM_ERROR("failed to find buffer: %i\n", ret);

		return ERR_PTR(-ENOENT);

	}

		goto err_out;



	/* Create the new framebuffer depending one what we got back */

	if (bo)

		ret = vmw_kms_new_framebuffer_dmabuf(dev_priv, bo, &vfb,

						     &mode_cmd);

	else if (surface)

		ret = vmw_kms_new_framebuffer_surface(dev_priv, file_priv,

						      surface, &vfb, &mode_cmd);

	else

		BUG();



	/* vmw_user_dmabuf_lookup takes one ref so does new_fb */

err_out:

	/* vmw_user_lookup_handle takes one ref so does new_fb */

	if (bo)

		vmw_dmabuf_unreference(&bo);

	if (surface)

		vmw_surface_unreference(&surface);



	if (ret) {

		DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);
@@ -1090,14 +1167,6 @@ try_dmabuf: 
		vfb->user_obj = user_obj;



	return &vfb->base;



err_not_scanout:

	DRM_ERROR("surface not marked as scanout\n");

	/* vmw_user_surface_lookup takes one ref */

	vmw_surface_unreference(&surface);

	ttm_base_object_unref(&user_obj);



	return ERR_PTR(-EINVAL);

}



static struct drm_mode_config_funcs vmw_kms_funcs = {
@@ -1114,10 +1183,12 @@ int vmw_kms_present(struct vmw_private *dev_priv, 
		    uint32_t num_clips)

{

	struct vmw_display_unit *units[VMWGFX_NUM_DISPLAY_UNITS];

	struct drm_clip_rect *tmp;

	struct drm_crtc *crtc;

	size_t fifo_size;

	int i, k, num_units;

	int ret = 0; /* silence warning */

	int left, right, top, bottom;



	struct {

		SVGA3dCmdHeader header;
@@ -1135,60 +1206,95 @@ int vmw_kms_present(struct vmw_private *dev_priv, 
	BUG_ON(surface == NULL);

	BUG_ON(!clips || !num_clips);



	tmp = kzalloc(sizeof(*tmp) * num_clips, GFP_KERNEL);

	if (unlikely(tmp == NULL)) {

		DRM_ERROR("Temporary cliprect memory alloc failed.\n");

		return -ENOMEM;

	}



	fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num_clips;

	cmd = kmalloc(fifo_size, GFP_KERNEL);

	if (unlikely(cmd == NULL)) {

		DRM_ERROR("Failed to allocate temporary fifo memory.\n");

		return -ENOMEM;

		ret = -ENOMEM;

		goto out_free_tmp;

	}



	left = clips->x;

	right = clips->x + clips->w;

	top = clips->y;

	bottom = clips->y + clips->h;



	for (i = 1; i < num_clips; i++) {

		left = min_t(int, left, (int)clips[i].x);

		right = max_t(int, right, (int)clips[i].x + clips[i].w);

		top = min_t(int, top, (int)clips[i].y);

		bottom = max_t(int, bottom, (int)clips[i].y + clips[i].h);

	}



	/* only need to do this once */

	memset(cmd, 0, fifo_size);

	cmd->header.id = cpu_to_le32(SVGA_3D_CMD_BLIT_SURFACE_TO_SCREEN);

	cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header));



	cmd->body.srcRect.left = 0;

	cmd->body.srcRect.right = surface->sizes[0].width;

	cmd->body.srcRect.top = 0;

	cmd->body.srcRect.bottom = surface->sizes[0].height;



	blits = (SVGASignedRect *)&cmd[1];



	cmd->body.srcRect.left = left;

	cmd->body.srcRect.right = right;

	cmd->body.srcRect.top = top;

	cmd->body.srcRect.bottom = bottom;



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

		blits[i].left   = clips[i].x;

		blits[i].right  = clips[i].x + clips[i].w;

		blits[i].top    = clips[i].y;

		blits[i].bottom = clips[i].y + clips[i].h;

		tmp[i].x1 = clips[i].x - left;

		tmp[i].x2 = clips[i].x + clips[i].w - left;

		tmp[i].y1 = clips[i].y - top;

		tmp[i].y2 = clips[i].y + clips[i].h - top;

	}



	for (k = 0; k < num_units; k++) {

		struct vmw_display_unit *unit = units[k];

		int clip_x1 = destX - unit->crtc.x;

		int clip_y1 = destY - unit->crtc.y;

		int clip_x2 = clip_x1 + surface->sizes[0].width;

		int clip_y2 = clip_y1 + surface->sizes[0].height;

		struct vmw_clip_rect clip;

		int num;



		clip.x1 = left + destX - unit->crtc.x;

		clip.y1 = top + destY - unit->crtc.y;

		clip.x2 = right + destX - unit->crtc.x;

		clip.y2 = bottom + destY - unit->crtc.y;



		/* skip any crtcs that misses the clip region */

		if (clip_x1 >= unit->crtc.mode.hdisplay ||

		    clip_y1 >= unit->crtc.mode.vdisplay ||

		    clip_x2 <= 0 || clip_y2 <= 0)

		if (clip.x1 >= unit->crtc.mode.hdisplay ||

		    clip.y1 >= unit->crtc.mode.vdisplay ||

		    clip.x2 <= 0 || clip.y2 <= 0)

			continue;



		/*

		 * In order for the clip rects to be correctly scaled

		 * the src and dest rects needs to be the same size.

		 */

		cmd->body.destRect.left = clip.x1;

		cmd->body.destRect.right = clip.x2;

		cmd->body.destRect.top = clip.y1;

		cmd->body.destRect.bottom = clip.y2;



		/* create a clip rect of the crtc in dest coords */

		clip.x2 = unit->crtc.mode.hdisplay - clip.x1;

		clip.y2 = unit->crtc.mode.vdisplay - clip.y1;

		clip.x1 = 0 - clip.x1;

		clip.y1 = 0 - clip.y1;



		/* need to reset sid as it is changed by execbuf */

		cmd->body.srcImage.sid = sid;



		cmd->body.destScreenId = unit->unit;



		/*

		 * The blit command is a lot more resilient then the

		 * readback command when it comes to clip rects. So its

		 * okay to go out of bounds.

		 */

		/* clip and write blits to cmd stream */

		vmw_clip_cliprects(tmp, num_clips, clip, blits, &num);



		cmd->body.destRect.left = clip_x1;

		cmd->body.destRect.right = clip_x2;

		cmd->body.destRect.top = clip_y1;

		cmd->body.destRect.bottom = clip_y2;

		/* if no cliprects hit skip this */

		if (num == 0)

			continue;



		/* recalculate package length */

		fifo_size = sizeof(*cmd) + sizeof(SVGASignedRect) * num;

		cmd->header.size = cpu_to_le32(fifo_size - sizeof(cmd->header));

		ret = vmw_execbuf_process(file_priv, dev_priv, NULL, cmd,

					  fifo_size, 0, NULL);
@@ -1197,6 +1303,8 @@ int vmw_kms_present(struct vmw_private *dev_priv, 
	}



	kfree(cmd);

out_free_tmp:

	kfree(tmp);



	return ret;

}