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

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

Merge tag 'drm-intel-fixes-2015-02-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

First batch of fixes for v4.0-rc, plenty of cc: stable material.

* tag 'drm-intel-fixes-2015-02-26' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Fix frontbuffer false positve.
  drm/i915: Align initial plane backing objects correctly
  drm/i915: avoid processing spurious/shared interrupts in low-power states
  drm/i915: Check obj->vma_list under the struct_mutex
  drm/i915: Fix a use after free, and unbalanced refcounting
  drm/i915: Dell Chromebook 11 has PWM backlight
  drm/i915/skl: handle all pixel formats in skylake_update_primary_plane()
  drm/i915/bdw: PCI IDs ending in 0xb are ULT.
parents a795e4e9 62e537f8

drivers/gpu/drm/i915/i915_drv.h

+14 −1
Original line number Diff line number Diff line
@@ -2114,6 +2114,9 @@ void i915_gem_track_fb(struct drm_i915_gem_object *old, 
 * number comparisons on buffer last_read|write_seqno. It also allows an

 * emission time to be associated with the request for tracking how far ahead

 * of the GPU the submission is.

 *

 * The requests are reference counted, so upon creation they should have an

 * initial reference taken using kref_init

 */

struct drm_i915_gem_request {

	struct kref ref;
@@ -2137,7 +2140,16 @@ struct drm_i915_gem_request { 
	/** Position in the ringbuffer of the end of the whole request */

	u32 tail;



	/** Context related to this request */

	/**

	 * Context related to this request

	 * Contexts are refcounted, so when this request is associated with a

	 * context, we must increment the context's refcount, to guarantee that

	 * it persists while any request is linked to it. Requests themselves

	 * are also refcounted, so the request will only be freed when the last

	 * reference to it is dismissed, and the code in

	 * i915_gem_request_free() will then decrement the refcount on the

	 * context.

	 */

	struct intel_context *ctx;



	/** Batch buffer related to this request if any */
@@ -2374,6 +2386,7 @@ struct drm_i915_cmd_table { 
				 (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)

#define IS_BDW_ULT(dev)		(IS_BROADWELL(dev) && \

				 ((INTEL_DEVID(dev) & 0xf) == 0x6 ||	\

				 (INTEL_DEVID(dev) & 0xf) == 0xb ||	\

				 (INTEL_DEVID(dev) & 0xf) == 0xe))

#define IS_BDW_GT3(dev)		(IS_BROADWELL(dev) && \

				 (INTEL_DEVID(dev) & 0x00F0) == 0x0020)

drivers/gpu/drm/i915/i915_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -2659,8 +2659,7 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv, 
		if (submit_req->ctx != ring->default_context)

			intel_lr_context_unpin(ring, submit_req->ctx);



		i915_gem_context_unreference(submit_req->ctx);

		kfree(submit_req);

		i915_gem_request_unreference(submit_req);

	}



	/*

drivers/gpu/drm/i915/i915_gem_stolen.c

+2 −4
Original line number Diff line number Diff line
@@ -485,10 +485,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
			stolen_offset, gtt_offset, size);



	/* KISS and expect everything to be page-aligned */

	BUG_ON(stolen_offset & 4095);

	BUG_ON(size & 4095);



	if (WARN_ON(size == 0))

	if (WARN_ON(size == 0) || WARN_ON(size & 4095) ||

	    WARN_ON(stolen_offset & 4095))

		return NULL;



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

drivers/gpu/drm/i915/i915_gem_tiling.c

+4 −3
Original line number Diff line number Diff line
@@ -335,9 +335,10 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	mutex_lock(&dev->struct_mutex);

	if (i915_gem_obj_is_pinned(obj) || obj->framebuffer_references) {

		drm_gem_object_unreference_unlocked(&obj->base);

		return -EBUSY;

		ret = -EBUSY;

		goto err;

	}



	if (args->tiling_mode == I915_TILING_NONE) {
@@ -369,7 +370,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
		}

	}



	mutex_lock(&dev->struct_mutex);

	if (args->tiling_mode != obj->tiling_mode ||

	    args->stride != obj->stride) {

		/* We need to rebind the object if its current allocation
@@ -424,6 +424,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
		obj->bit_17 = NULL;

	}



err:

	drm_gem_object_unreference(&obj->base);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/i915/i915_irq.c

+22 −0
Original line number Diff line number Diff line
@@ -1892,6 +1892,9 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) 
	u32 iir, gt_iir, pm_iir;

	irqreturn_t ret = IRQ_NONE;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	while (true) {

		/* Find, clear, then process each source of interrupt */
@@ -1936,6 +1939,9 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg) 
	u32 master_ctl, iir;

	irqreturn_t ret = IRQ_NONE;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	for (;;) {

		master_ctl = I915_READ(GEN8_MASTER_IRQ) & ~GEN8_MASTER_IRQ_CONTROL;

		iir = I915_READ(VLV_IIR);
@@ -2208,6 +2214,9 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
	u32 de_iir, gt_iir, de_ier, sde_ier = 0;

	irqreturn_t ret = IRQ_NONE;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	/* We get interrupts on unclaimed registers, so check for this before we

	 * do any I915_{READ,WRITE}. */

	intel_uncore_check_errors(dev);
@@ -2279,6 +2288,9 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) 
	enum pipe pipe;

	u32 aux_mask = GEN8_AUX_CHANNEL_A;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	if (IS_GEN9(dev))

		aux_mask |=  GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |

			GEN9_AUX_CHANNEL_D;
@@ -3771,6 +3783,9 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |

		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	iir = I915_READ16(IIR);

	if (iir == 0)

		return IRQ_NONE;
@@ -3951,6 +3966,9 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;

	int pipe, ret = IRQ_NONE;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	iir = I915_READ(IIR);

	do {

		bool irq_received = (iir & ~flip_mask) != 0;
@@ -4171,6 +4189,9 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |

		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;



	if (!intel_irqs_enabled(dev_priv))

		return IRQ_NONE;



	iir = I915_READ(IIR);



	for (;;) {
@@ -4520,6 +4541,7 @@ void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv) 
{

	dev_priv->dev->driver->irq_uninstall(dev_priv->dev);

	dev_priv->pm.irqs_enabled = false;

	synchronize_irq(dev_priv->dev->irq);

}



/**