Commit 7cd9beb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Misc i915, vmwgfx and radeon fixes along with a fix for one of those
  recursive sleep mutex debug cases in the mst code"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
  drm/vmwgfx: Correctly NULLify dma buffer pointer on failure
  drm/vmwgfx: Reorder device takedown somewhat
  drm/vmwgfx: Fix a couple of lock dependency violations
  drm/radeon: drop setting UPLL to sleep mode
  drm/radeon: fix wait to actually occur after the signaling callback
  drm/i915: Prevent TLB error on first execution on SNB
  drm/i915: Do both mt and gen6 style forcewake reset on ivb probe
  drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again
  drm/i915: use in_interrupt() not in_irq() to check context
  drm/mst: fix recursive sleep warning on qlock
  drm: Don't assign fbs for universal cursor support to files
parents 60b3e7bd e2cdcafa

drivers/gpu/drm/drm_crtc.c

+19 −16
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 
#include "drm_crtc_internal.h"

#include "drm_internal.h"



static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev,

static struct drm_framebuffer *

internal_framebuffer_create(struct drm_device *dev,

			    struct drm_mode_fb_cmd2 *r,

			    struct drm_file *file_priv);
@@ -2908,13 +2909,11 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc, 
	 */

	if (req->flags & DRM_MODE_CURSOR_BO) {

		if (req->handle) {

			fb = add_framebuffer_internal(dev, &fbreq, file_priv);

			fb = internal_framebuffer_create(dev, &fbreq, file_priv);

			if (IS_ERR(fb)) {

				DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n");

				return PTR_ERR(fb);

			}



			drm_framebuffer_reference(fb);

		} else {

			fb = NULL;

		}
@@ -3267,7 +3266,8 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) 
	return 0;

}



static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev,

static struct drm_framebuffer *

internal_framebuffer_create(struct drm_device *dev,

			    struct drm_mode_fb_cmd2 *r,

			    struct drm_file *file_priv)

{
@@ -3301,12 +3301,6 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, 
		return fb;

	}



	mutex_lock(&file_priv->fbs_lock);

	r->fb_id = fb->base.id;

	list_add(&fb->filp_head, &file_priv->fbs);

	DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);

	mutex_unlock(&file_priv->fbs_lock);



	return fb;

}
@@ -3328,15 +3322,24 @@ static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, 
int drm_mode_addfb2(struct drm_device *dev,

		    void *data, struct drm_file *file_priv)

{

	struct drm_mode_fb_cmd2 *r = data;

	struct drm_framebuffer *fb;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	fb = add_framebuffer_internal(dev, data, file_priv);

	fb = internal_framebuffer_create(dev, r, file_priv);

	if (IS_ERR(fb))

		return PTR_ERR(fb);



	/* Transfer ownership to the filp for reaping on close */



	DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);

	mutex_lock(&file_priv->fbs_lock);

	r->fb_id = fb->base.id;

	list_add(&fb->filp_head, &file_priv->fbs);

	mutex_unlock(&file_priv->fbs_lock);



	return 0;

}

drivers/gpu/drm/drm_dp_mst_topology.c

+8 −3
Original line number Diff line number Diff line
@@ -733,10 +733,14 @@ static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr, 
			      struct drm_dp_sideband_msg_tx *txmsg)

{

	bool ret;

	mutex_lock(&mgr->qlock);



	/*

	 * All updates to txmsg->state are protected by mgr->qlock, and the two

	 * cases we check here are terminal states. For those the barriers

	 * provided by the wake_up/wait_event pair are enough.

	 */

	ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||

	       txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);

	mutex_unlock(&mgr->qlock);

	return ret;

}
@@ -1363,12 +1367,13 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, 
	return 0;

}



/* must be called holding qlock */

static void process_single_down_tx_qlock(struct drm_dp_mst_topology_mgr *mgr)

{

	struct drm_dp_sideband_msg_tx *txmsg;

	int ret;



	WARN_ON(!mutex_is_locked(&mgr->qlock));



	/* construct a chunk from the first msg in the tx_msg queue */

	if (list_empty(&mgr->tx_msg_downq)) {

		mgr->tx_down_in_progress = false;

drivers/gpu/drm/i915/i915_gem.c

+20 −5
Original line number Diff line number Diff line
@@ -2936,9 +2936,9 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	req = obj->last_read_req;



	/* Do this after OLR check to make sure we make forward progress polling

	 * on this IOCTL with a timeout <=0 (like busy ioctl)

	 * on this IOCTL with a timeout == 0 (like busy ioctl)

	 */

	if (args->timeout_ns <= 0) {

	if (args->timeout_ns == 0) {

		ret = -ETIME;

		goto out;

	}
@@ -2948,7 +2948,8 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	i915_gem_request_reference(req);

	mutex_unlock(&dev->struct_mutex);



	ret = __i915_wait_request(req, reset_counter, true, &args->timeout_ns,

	ret = __i915_wait_request(req, reset_counter, true,

				  args->timeout_ns > 0 ? &args->timeout_ns : NULL,

				  file->driver_priv);

	mutex_lock(&dev->struct_mutex);

	i915_gem_request_unreference(req);
@@ -4792,6 +4793,9 @@ i915_gem_init_hw(struct drm_device *dev) 
	if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())

		return -EIO;



	/* Double layer security blanket, see i915_gem_init() */

	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);



	if (dev_priv->ellc_size)

		I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf));
@@ -4824,7 +4828,7 @@ i915_gem_init_hw(struct drm_device *dev) 
	for_each_ring(ring, dev_priv, i) {

		ret = ring->init_hw(ring);

		if (ret)

			return ret;

			goto out;

	}



	for (i = 0; i < NUM_L3_SLICES(dev); i++)
@@ -4841,9 +4845,11 @@ i915_gem_init_hw(struct drm_device *dev) 
		DRM_ERROR("Context enable failed %d\n", ret);

		i915_gem_cleanup_ringbuffer(dev);



		return ret;

		goto out;

	}



out:

	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);

	return ret;

}
@@ -4877,6 +4883,14 @@ int i915_gem_init(struct drm_device *dev) 
		dev_priv->gt.stop_ring = intel_logical_ring_stop;

	}



	/* This is just a security blanket to placate dragons.

	 * On some systems, we very sporadically observe that the first TLBs

	 * used by the CS may be stale, despite us poking the TLB reset. If

	 * we hold the forcewake during initialisation these problems

	 * just magically go away.

	 */

	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);



	ret = i915_gem_init_userptr(dev);

	if (ret)

		goto out_unlock;
@@ -4903,6 +4917,7 @@ int i915_gem_init(struct drm_device *dev) 
	}



out_unlock:

	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);

	mutex_unlock(&dev->struct_mutex);



	return ret;

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -9716,7 +9716,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) 
	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	WARN_ON(!in_irq());

	WARN_ON(!in_interrupt());



	if (crtc == NULL)

		return;

drivers/gpu/drm/i915/intel_uncore.c

+7 −1
Original line number Diff line number Diff line
@@ -1048,8 +1048,14 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev) 


		/* We need to init first for ECOBUS access and then

		 * determine later if we want to reinit, in case of MT access is

		 * not working

		 * not working. In this stage we don't know which flavour this

		 * ivb is, so it is better to reset also the gen6 fw registers

		 * before the ecobus check.

		 */



		__raw_i915_write32(dev_priv, FORCEWAKE, 0);

		__raw_posting_read(dev_priv, ECOBUS);



		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,

			       FORCEWAKE_MT, FORCEWAKE_MT_ACK);

CRA Git | Maintained and supported by SUSTech CRA and CCSE