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

Commit 98c7b423 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 

Daniel writes: (this pull is the one with the bad patch dropped)
First pile of fixes for 3.6 already, and I'm afraid it's a bit larger than
what I'd wish for. But I've moved all the feature-y stuff to -next, so
this really is all -fixes. Most of it is handling fallout from the hw
context stuff, discovered now that mesa git has started using them for
real. Otherwise all just small fixes:
- unbreak modeset=0 on gen6+ (regressed in next)
- const mismatch fix for ->mode_fixup
- simplify overly clever lvds modeset code (current code can totally
  confuse backlights, resulting in broken panels until a full power draw
  restores them).
- fix some fallout from the flushing_list disabling (regression only
  introduced in -next)
- DP link train improvements (this also kills the last 3.2 dp regression
  afaik)
- bugfix for the new ddc VGA detection on newer platforms
- minor backlight fixes (one of them a -next regression)
- only enable the required PM interrupts (to avoid waking up the cpu
  unnecessarily)
- some really minor bits (workaround clarification, make coverty happy,
  hsw init fix)
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (23 commits)
  drm/i915: unbreak lastclose for failed driver init
  drm/i915: Set the context before setting up regs for the context.
  drm/i915: constify mode in crtc_mode_fixup
  drm/i915/lvds: ditch ->prepare special case
  drm/i915: dereferencing an error pointer
  drm/i915: fix invalid reference handling of the default ctx obj
  drm/i915: Add -EIO to the list of known errors for __wait_seqno
  drm/i915: Flush the context object from the CPU caches upon switching
  drm/i915: Make the lock for pageflips interruptible
  drm/i915: don't forget the PCH backlight registers
  drm/i915: Insert a flush between batches if the breadcrumb was dropped
  drm/i915: missing error case in init status page
  drm/i915: mask tiled bit when updating ILK sprites
  drm/i915: try to train DP even harder
  drm/i915: kill intel_ddc_probe
  drm/i915: check whether we actually received an edid in detect_ddc
  drm/i915: fix up PCH backlight #define mixup
  drm/i915: Add comments to explain the BSD tail write workaround
  drm/i915: Disable the BLT on pre-production SNB hardware
  drm/i915: initialize power wells in modeset_init_hw
  ...
parents 2536f7dc e8aeaee7

drivers/gpu/drm/i915/i915_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ static void i915_ring_error_state(struct seq_file *m, 
	seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm[ring]);

	seq_printf(m, "  FADDR: 0x%08x\n", error->faddr[ring]);

	if (INTEL_INFO(dev)->gen >= 6) {

		seq_printf(m, "  RC PSMI: 0x%08x\n", error->rc_psmi[ring]);

		seq_printf(m, "  FAULT_REG: 0x%08x\n", error->fault_reg[ring]);

		seq_printf(m, "  SYNC_0: 0x%08x\n",

			   error->semaphore_mboxes[ring][0]);

drivers/gpu/drm/i915/i915_dma.c

+7 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,13 @@ void i915_driver_lastclose(struct drm_device * dev) 
{

	drm_i915_private_t *dev_priv = dev->dev_private;



	if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {

	/* On gen6+ we refuse to init without kms enabled, but then the drm core

	 * goes right around and calls lastclose. Check for this and don't clean

	 * up anything. */

	if (!dev_priv)

		return;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		intel_fb_restore_mode(dev);

		vga_switcheroo_process_delayed_switch();

		return;

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ struct drm_i915_error_state { 
	u32 instdone[I915_NUM_RINGS];

	u32 acthd[I915_NUM_RINGS];

	u32 semaphore_mboxes[I915_NUM_RINGS][I915_NUM_RINGS - 1];

	u32 rc_psmi[I915_NUM_RINGS]; /* sleep state */

	/* our own tracking of ring head and tail */

	u32 cpu_ring_head[I915_NUM_RINGS];

	u32 cpu_ring_tail[I915_NUM_RINGS];

drivers/gpu/drm/i915/i915_gem.c

+18 −1
Original line number Diff line number Diff line
@@ -2003,6 +2003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
	}



	switch (end) {

	case -EIO:

	case -EAGAIN: /* Wedged */

	case -ERESTARTSYS: /* Signal */

		return (int)end;
@@ -3726,6 +3727,22 @@ void i915_gem_init_ppgtt(struct drm_device *dev) 
	}

}



static bool

intel_enable_blt(struct drm_device *dev)

{

	if (!HAS_BLT(dev))

		return false;



	/* The blitter was dysfunctional on early prototypes */

	if (IS_GEN6(dev) && dev->pdev->revision < 8) {

		DRM_INFO("BLT not supported on this pre-production hardware;"

			 " graphics performance will be degraded.\n");

		return false;

	}



	return true;

}



int

i915_gem_init_hw(struct drm_device *dev)

{
@@ -3749,7 +3766,7 @@ i915_gem_init_hw(struct drm_device *dev) 
			goto cleanup_render_ring;

	}



	if (HAS_BLT(dev)) {

	if (intel_enable_blt(dev)) {

		ret = intel_init_blt_ring_buffer(dev);

		if (ret)

			goto cleanup_bsd_ring;

drivers/gpu/drm/i915/i915_gem_context.c

+20 −17
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static int get_context_size(struct drm_device *dev) 
		ret = GEN6_CXT_TOTAL_SIZE(reg) * 64;

		break;

	case 7:

		reg = I915_READ(GEN7_CTX_SIZE);

		ret = GEN7_CTX_TOTAL_SIZE(reg) * 64;

		reg = I915_READ(GEN7_CXT_SIZE);

		ret = GEN7_CXT_TOTAL_SIZE(reg) * 64;

		break;

	default:

		BUG();
@@ -374,6 +374,17 @@ static int do_switch(struct drm_i915_gem_object *from_obj, 
	if (ret)

		return ret;



	/* Clear this page out of any CPU caches for coherent swap-in/out. Note

	 * that thanks to write = false in this call and us not setting any gpu

	 * write domains when putting a context object onto the active list

	 * (when switching away from it), this won't block.

	 * XXX: We need a real interface to do this instead of trickery. */

	ret = i915_gem_object_set_to_gtt_domain(to->obj, false);

	if (ret) {

		i915_gem_object_unpin(to->obj);

		return ret;

	}



	if (!to->obj->has_global_gtt_mapping)

		i915_gem_gtt_bind_object(to->obj, to->obj->cache_level);
@@ -408,8 +419,11 @@ static int do_switch(struct drm_i915_gem_object *from_obj, 
		from_obj->dirty = 1;

		BUG_ON(from_obj->ring != to->ring);

		i915_gem_object_unpin(from_obj);



		drm_gem_object_unreference(&from_obj->base);

	}



	drm_gem_object_reference(&to->obj->base);

	ring->last_context_obj = to->obj;

	to->is_initialized = true;
@@ -459,20 +473,7 @@ int i915_switch_context(struct intel_ring_buffer *ring, 
	if (from_obj == to->obj)

		return 0;



	ret = do_switch(from_obj, to, i915_gem_next_request_seqno(to->ring));

	if (ret)

		return ret;



	/* Just to make the code a little cleaner we take the object reference

	 * after the switch was successful. It would be more intuitive to ref

	 * the 'to' object before the switch but we know the refcount must be >0

	 * if context_get() succeeded, and we hold struct mutex. So it's safe to

	 * do this here/now

	 */

	drm_gem_object_reference(&to->obj->base);

	if (from_obj != NULL)

		drm_gem_object_unreference(&from_obj->base);

	return ret;

	return do_switch(from_obj, to, i915_gem_next_request_seqno(to->ring));

}



int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
@@ -496,11 +497,13 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, 


	ctx = create_hw_context(dev, file_priv);

	mutex_unlock(&dev->struct_mutex);

	if (IS_ERR(ctx))

		return PTR_ERR(ctx);



	args->ctx_id = ctx->id;

	DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id);



	return PTR_RET(ctx);

	return 0;

}



int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,