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

Commit 884d6147 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-06-17' of git://anongit.freedesktop.org/drm-intel into drm-next 

First round of fixes for 3.16-rc, mostly cc: stable, and the vt/vgacon
fixes from Daniel [1] to avoid hangs and unclaimed register errors on
module load/reload.

* tag 'drm-intel-fixes-2014-06-17' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/bdw: remove erroneous chv specific workarounds from bdw code
  drm/i915: fix possible refcount leak when resetting forcewake
  drm/i915: Reorder semaphore deadlock check
  drm/i95: Initialize active ring->pid to -1
  drm/i915: set backlight duty cycle after backlight enable for gen4
  drm/i915: Avoid div-by-zero when pixel_multiplier is zero
  drm/i915: Disable FBC by default also on Haswell and later
  drm/i915: Kick out vga console
  drm/i915: Fixup global gtt cleanup
  vt: Don't ignore unbind errors in vt_unbind
  vt: Fix up unregistration of vt drivers
  vt: Fix replacement console check when unbinding
parents fb54918a 223a6f2b

drivers/gpu/drm/i915/i915_dma.c

+42 −5
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include "i915_drv.h"

#include "i915_trace.h"

#include <linux/pci.h>

#include <linux/console.h>

#include <linux/vt.h>

#include <linux/vgaarb.h>

#include <linux/acpi.h>

#include <linux/pnp.h>
@@ -1386,7 +1388,6 @@ cleanup_gem: 
	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	WARN_ON(dev_priv->mm.aliasing_ppgtt);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

cleanup_irq:

	drm_irq_uninstall(dev);

cleanup_gem_stolen:
@@ -1450,6 +1451,38 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 
}

#endif



#if !defined(CONFIG_VGA_CONSOLE)

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	return 0;

}

#elif !defined(CONFIG_DUMMY_CONSOLE)

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	return -ENODEV;

}

#else

static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)

{

	int ret;



	DRM_INFO("Replacing VGA console driver\n");



	console_lock();

	ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);

	if (ret == 0) {

		ret = do_unregister_con_driver(&vga_con);



		/* Ignore "already unregistered". */

		if (ret == -ENODEV)

			ret = 0;

	}

	console_unlock();



	return ret;

}

#endif



static void i915_dump_device_info(struct drm_i915_private *dev_priv)

{

	const struct intel_device_info *info = &dev_priv->info;
@@ -1623,8 +1656,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (ret)

		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET))

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = i915_kick_out_vgacon(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting VGA console\n");

			goto out_gtt;

		}



		i915_kick_out_firmware_fb(dev_priv);

	}



	pci_set_master(dev->pdev);
@@ -1756,8 +1796,6 @@ out_mtrrfree: 
	arch_phys_wc_del(dev_priv->gtt.mtrr);

	io_mapping_free(dev_priv->gtt.mappable);

out_gtt:

	list_del(&dev_priv->gtt.base.global_link);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

	dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);

out_regs:

	intel_uncore_fini(dev);
@@ -1846,7 +1884,6 @@ int i915_driver_unload(struct drm_device *dev) 
			i915_free_hws(dev);

	}



	list_del(&dev_priv->gtt.base.global_link);

	WARN_ON(!list_empty(&dev_priv->vm_list));



	drm_vblank_cleanup(dev);

drivers/gpu/drm/i915/i915_gem_gtt.c

+8 −1
Original line number Diff line number Diff line
@@ -1992,7 +1992,10 @@ static void gen6_gmch_remove(struct i915_address_space *vm) 


	struct i915_gtt *gtt = container_of(vm, struct i915_gtt, base);



	if (drm_mm_initialized(&vm->mm)) {

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	iounmap(gtt->gsm);

	teardown_scratch_page(vm->dev);

}
@@ -2025,6 +2028,10 @@ static int i915_gmch_probe(struct drm_device *dev, 


static void i915_gmch_remove(struct i915_address_space *vm)

{

	if (drm_mm_initialized(&vm->mm)) {

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	intel_gmch_remove();

}

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −1
Original line number Diff line number Diff line
@@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev, 
	for (i = 0; i < I915_NUM_RINGS; i++) {

		struct intel_engine_cs *ring = &dev_priv->ring[i];



		error->ring[i].pid = -1;



		if (ring->dev == NULL)

			continue;
@@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev, 


		i915_record_ring_state(dev, ring, &error->ring[i]);



		error->ring[i].pid = -1;

		request = i915_gem_find_active_request(ring);

		if (request) {

			/* We need to copy these to an anonymous buffer

drivers/gpu/drm/i915/i915_irq.c

+14 −4
Original line number Diff line number Diff line
@@ -2847,10 +2847,14 @@ static int semaphore_passed(struct intel_engine_cs *ring) 
	struct intel_engine_cs *signaller;

	u32 seqno, ctl;



	ring->hangcheck.deadlock = true;

	ring->hangcheck.deadlock++;



	signaller = semaphore_waits_for(ring, &seqno);

	if (signaller == NULL || signaller->hangcheck.deadlock)

	if (signaller == NULL)

		return -1;



	/* Prevent pathological recursion due to driver bugs */

	if (signaller->hangcheck.deadlock >= I915_NUM_RINGS)

		return -1;



	/* cursory check for an unkickable deadlock */
@@ -2858,7 +2862,13 @@ static int semaphore_passed(struct intel_engine_cs *ring) 
	if (ctl & RING_WAIT_SEMAPHORE && semaphore_passed(signaller) < 0)

		return -1;



	return i915_seqno_passed(signaller->get_seqno(signaller, false), seqno);

	if (i915_seqno_passed(signaller->get_seqno(signaller, false), seqno))

		return 1;



	if (signaller->hangcheck.deadlock)

		return -1;



	return 0;

}



static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)
@@ -2867,7 +2877,7 @@ static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv) 
	int i;



	for_each_ring(ring, dev_priv, i)

		ring->hangcheck.deadlock = false;

		ring->hangcheck.deadlock = 0;

}



static enum intel_ring_hangcheck_action

drivers/gpu/drm/i915/intel_panel.c

+2 −3
Original line number Diff line number Diff line
@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector) 
	ctl = freq << 16;

	I915_WRITE(BLC_PWM_CTL, ctl);



	/* XXX: combine this into above write? */

	intel_panel_actually_set_backlight(connector, panel->backlight.level);



	ctl2 = BLM_PIPE(pipe);

	if (panel->backlight.combination_mode)

		ctl2 |= BLM_COMBINATION_MODE;
@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector) 
	I915_WRITE(BLC_PWM_CTL2, ctl2);

	POSTING_READ(BLC_PWM_CTL2);

	I915_WRITE(BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE);



	intel_panel_actually_set_backlight(connector, panel->backlight.level);

}



static void vlv_enable_backlight(struct intel_connector *connector)