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

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

Merge tag 'drm-intel-next-2012-05-20' of... 

Merge tag 'drm-intel-next-2012-05-20' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

Daniel wrote:

The last pull I'd like to squeeze into 3.5, safe for the hsw stuff mostly
bugfixes:
- last few patches for basic hsw enabling (Eugeni, infoframe support by
 Paulo)
- Fix up infoframe support, we've hopefully squashed all the cargo-culting
 in there (Paulo). Among all the issues, this finally fixes some of the
 infoframe regressions seen on g4x and snb systems.
- Fixup sdvo infoframe support, this fixes a regression from 2.6.37.
- Correctly enable semaphores on snb, we've enabled it already for 3.5,
 but the dmar check was slightly wrong.
- gen6 irq fixlets from Chris.
- disable gmbus on i830, the hw seems to be simply broken.
- fix up the pch pll fallout (Chris & me).
- for_each_ring macro from Chris - I've figured I'll merge this now to
 avoid backport pain.
- complain when the rps state isn't what we expect (Chris). Note that this
 is shockingly easy to hit and hence pretty much will cause a regression
 report. But it only tells us that the gpu turbo state got out of whack,
 a problem we know off since a long time (it cause the gpu to get stuck a
 a fixed frequency, usually the lowest one). Chris is working on a fix,
 but we haven't yet found a magic formula that works perfectly (only
 patches that massively reduce the frequency of this happening).
- MAINTAINERS patch, I'm now officially the guy to beat up."

* tag 'drm-intel-next-2012-05-20' of git://people.freedesktop.org/~danvet/drm-intel: (57 commits)
  drm/i915: IBX has a fixed pch pll to pch pipe mapping
  drm/i915: implement hsw_write_infoframe
  drm/i915: small hdmi coding style cleanups
  drm/i915: fixup infoframe support for sdvo
  drm/i915: Enable the PCH PLL for all generations after link training
  drm/i915: Convert BUG_ON(!pll->active) and friends to a WARN
  drm/i915: don't clobber the pipe param in sanitize_modesetting
  drm/i915: disable gmbus on i830
  drm/i915: Replace the feature tests for BLT/BSD with ring init checks
  drm/i915: Check whether the ring is initialised prior to dispatch
  drm/i915: Introduce for_each_ring() macro
  drm/i915: Assert that the transcoder is indeed off before modifying it
  drm/i915: hook Haswell devices in place
  drm/i915: prepare HDMI link for Haswell
  drm/i915: move HDMI structs to shared location
  drm/i915: add WR PLL programming table
  drm/i915: add support for DDI-controlled digital outputs
  drm/i915: detect digital outputs on Haswell
  drm/i915: program iCLKIP on Lynx Point
  drm/i915: program WM_LINETIME on Haswell
  ...
parents 64172ccb 98b6bd99

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2373,10 +2373,10 @@ F: drivers/gpu/drm/ 
F:	include/drm/



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Keith Packard <keithp@keithp.com>

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

L:	intel-gfx@lists.freedesktop.org (subscribers-only)

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git

T:	git git://people.freedesktop.org/~danvet/drm-intel

S:	Supported

F:	drivers/gpu/drm/i915

F:	include/drm/i915*

drivers/char/agp/intel-agp.c

+4 −0
Original line number Diff line number Diff line
@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),

	ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),

	{ }

};

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ 
	  intel_crt.o \

	  intel_lvds.o \

	  intel_bios.o \

	  intel_ddi.o \

	  intel_dp.o \

	  intel_hdmi.o \

	  intel_sdvo.o \

drivers/gpu/drm/i915/i915_debugfs.c

+3 −6
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static int i915_error_state(struct seq_file *m, void *unused) 
	struct drm_device *dev = error_priv->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_error_state *error = error_priv->error;

	struct intel_ring_buffer *ring;

	int i, j, page, offset, elt;



	if (!error) {
@@ -706,7 +707,6 @@ static int i915_error_state(struct seq_file *m, void *unused) 
		return 0;

	}





	seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,

		   error->time.tv_usec);

	seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
@@ -722,11 +722,8 @@ static int i915_error_state(struct seq_file *m, void *unused) 
		seq_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);

	}



	i915_ring_error_state(m, dev, error, RCS);

	if (HAS_BLT(dev))

		i915_ring_error_state(m, dev, error, BCS);

	if (HAS_BSD(dev))

		i915_ring_error_state(m, dev, error, VCS);

	for_each_ring(ring, dev_priv, i)

		i915_ring_error_state(m, dev, error, i);



	if (error->active_bo)

		print_error_buffers(m, "Active",

drivers/gpu/drm/i915/i915_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -980,10 +980,10 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = 1;

		break;

	case I915_PARAM_HAS_BSD:

		value = HAS_BSD(dev);

		value = intel_ring_initialized(&dev_priv->ring[VCS]);

		break;

	case I915_PARAM_HAS_BLT:

		value = HAS_BLT(dev);

		value = intel_ring_initialized(&dev_priv->ring[BCS]);

		break;

	case I915_PARAM_HAS_RELAXED_FENCING:

		value = 1;