Commit ec50f2a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Fix for radeon nomodeset regression, old radeon interface cliprects
  fix, 2 qxl crasher fixes, and a couple of minor cleanups.

  I may have a new AMD hw support branch next week, its one of those
  doesn't affect anything existing just adds new support, I'll see how
  it shapes up and I might ask you to take it, just thought I'd warn in
  advance."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: restore nomodeset operation (v2)
  qxl: fix bug with object eviction and update area
  drm/qxl: drop active_user_framebuffer as its unneeded
  qxl: drop unused variable.
  drm/qxl: fix ioport interactions for kernel submitted commands.
  drm: remove unused wrapper macros
  drm/radeon: check incoming cliprects pointer
parents d5fe85af e9ced8e0

drivers/gpu/drm/qxl/qxl_cmd.c

+19 −10
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ out_unref: 
	return 0;

}



static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port)

static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port, bool intr)

{

	int irq_num;

	long addr = qdev->io_base + port;
@@ -285,20 +285,29 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port) 


	mutex_lock(&qdev->async_io_mutex);

	irq_num = atomic_read(&qdev->irq_received_io_cmd);





	if (qdev->last_sent_io_cmd > irq_num) {

		ret = wait_event_interruptible(qdev->io_cmd_event,

					       atomic_read(&qdev->irq_received_io_cmd) > irq_num);

		if (ret)

		if (intr)

			ret = wait_event_interruptible_timeout(qdev->io_cmd_event,

							       atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);

		else

			ret = wait_event_timeout(qdev->io_cmd_event,

						 atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);

		/* 0 is timeout, just bail the "hw" has gone away */

		if (ret <= 0)

			goto out;

		irq_num = atomic_read(&qdev->irq_received_io_cmd);

	}

	outb(val, addr);

	qdev->last_sent_io_cmd = irq_num + 1;

	ret = wait_event_interruptible(qdev->io_cmd_event,

				       atomic_read(&qdev->irq_received_io_cmd) > irq_num);

	if (intr)

		ret = wait_event_interruptible_timeout(qdev->io_cmd_event,

						       atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);

	else

		ret = wait_event_timeout(qdev->io_cmd_event,

					 atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);

out:

	if (ret > 0)

		ret = 0;

	mutex_unlock(&qdev->async_io_mutex);

	return ret;

}
@@ -308,7 +317,7 @@ static void wait_for_io_cmd(struct qxl_device *qdev, uint8_t val, long port) 
	int ret;



restart:

	ret = wait_for_io_cmd_user(qdev, val, port);

	ret = wait_for_io_cmd_user(qdev, val, port, false);

	if (ret == -ERESTARTSYS)

		goto restart;

}
@@ -340,7 +349,7 @@ int qxl_io_update_area(struct qxl_device *qdev, struct qxl_bo *surf, 
	mutex_lock(&qdev->update_area_mutex);

	qdev->ram_header->update_area = *area;

	qdev->ram_header->update_surface = surface_id;

	ret = wait_for_io_cmd_user(qdev, 0, QXL_IO_UPDATE_AREA_ASYNC);

	ret = wait_for_io_cmd_user(qdev, 0, QXL_IO_UPDATE_AREA_ASYNC, true);

	mutex_unlock(&qdev->update_area_mutex);

	return ret;

}

drivers/gpu/drm/qxl/qxl_display.c

+4 −13
Original line number Diff line number Diff line
@@ -428,10 +428,10 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, 
	int inc = 1;



	qobj = gem_to_qxl_bo(qxl_fb->obj);

	if (qxl_fb != qdev->active_user_framebuffer) {

		DRM_INFO("%s: qxl_fb 0x%p != qdev->active_user_framebuffer 0x%p\n",

			__func__, qxl_fb, qdev->active_user_framebuffer);

	}

	/* if we aren't primary surface ignore this */

	if (!qobj->is_primary)

		return 0;



	if (!num_clips) {

		num_clips = 1;

		clips = &norect;
@@ -604,7 +604,6 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc, 
					       mode->hdisplay,

					       mode->vdisplay);

	}

	qdev->mode_set = true;

	return 0;

}
@@ -893,7 +892,6 @@ qxl_user_framebuffer_create(struct drm_device *dev, 
{

	struct drm_gem_object *obj;

	struct qxl_framebuffer *qxl_fb;

	struct qxl_device *qdev = dev->dev_private;

	int ret;



	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
@@ -909,13 +907,6 @@ qxl_user_framebuffer_create(struct drm_device *dev, 
		return NULL;

	}



	if (qdev->active_user_framebuffer) {

		DRM_INFO("%s: active_user_framebuffer %p -> %p\n",

			 __func__,

			 qdev->active_user_framebuffer, qxl_fb);

	}

	qdev->active_user_framebuffer = qxl_fb;



	return &qxl_fb->base;

}

drivers/gpu/drm/qxl/qxl_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -255,12 +255,6 @@ struct qxl_device { 
	struct qxl_gem		gem;

	struct qxl_mode_info mode_info;



	/*

	 * last created framebuffer with fb_create

	 * only used by debugfs dumbppm

	 */

	struct qxl_framebuffer *active_user_framebuffer;



	struct fb_info			*fbdev_info;

	struct qxl_framebuffer	*fbdev_qfb;

	void *ram_physical;
@@ -270,7 +264,6 @@ struct qxl_device { 
	struct qxl_ring *cursor_ring;



	struct qxl_ram_header *ram_header;

	bool mode_set;



	bool primary_created;

drivers/gpu/drm/qxl/qxl_ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data, 
		goto out;



	if (!qobj->pin_count) {

		qxl_ttm_placement_from_domain(qobj, qobj->type);

		ret = ttm_bo_validate(&qobj->tbo, &qobj->placement,

				      true, false);

		if (unlikely(ret))

drivers/gpu/drm/radeon/r300_cmdbuf.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, 
		OUT_RING(CP_PACKET0(R300_RE_CLIPRECT_TL_0, nr * 2 - 1));



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

			if (DRM_COPY_FROM_USER_UNCHECKED

			if (DRM_COPY_FROM_USER

			    (&box, &cmdbuf->boxes[n + i], sizeof(box))) {

				DRM_ERROR("copy cliprect faulted\n");

				return -EFAULT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE