Home » Mailing list archives » linux-kernel » 2010 » May » 11

Re: [003/117] drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.

Previous thread: [001/117] USB: EHCI: defer reclamation of siTDs by Greg KH on Monday, May 10, 2010 - 3:31 pm. (1 message)

Next thread: [012/117] flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO by Greg KH on Monday, May 10, 2010 - 3:31 pm. (1 message)
[view original message]
From: Greg KH
Subject: [003/117] drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.
Date: Monday, May 10, 2010 - 3:31 pm

2.6.33-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Eric Anholt <eric@anholt.net>

commit bad720ff3e8e47a04bd88d9bbc8317e7d7e049d3 upstream.

[needed for stable as it's just a bunch of macros that other drm patches
need, it changes no code functionality besides adding support for a new
device type. - gregkh]

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/gpu/drm/i915/i915_debugfs.c    |    2 -
 drivers/gpu/drm/i915/i915_dma.c        |   16 ++++++---
 drivers/gpu/drm/i915/i915_drv.h        |   26 ++++++++++++++-
 drivers/gpu/drm/i915/i915_gem.c        |    2 -
 drivers/gpu/drm/i915/i915_gem_tiling.c |    2 -
 drivers/gpu/drm/i915/i915_irq.c        |   18 +++++-----
 drivers/gpu/drm/i915/intel_bios.c      |    3 +
 drivers/gpu/drm/i915/intel_crt.c       |   14 ++++----
 drivers/gpu/drm/i915/intel_display.c   |   56 ++++++++++++++++-----------------
 drivers/gpu/drm/i915/intel_lvds.c      |    2 -
 drivers/gpu/drm/i915/intel_overlay.c   |    2 -
 include/drm/drm_pciids.h               |    1 
 12 files changed, 88 insertions(+), 56 deletions(-)

--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -162,7 +162,7 @@ static int i915_interrupt_info(struct se
 	struct drm_device *dev = node->minor->dev;
 	drm_i915_private_t *dev_priv = dev->dev_private;
 
-	if (!IS_IRONLAKE(dev)) {
+	if (!HAS_PCH_SPLIT(dev)) {
 		seq_printf(m, "Interrupt enable:    %08x\n",
 			   I915_READ(IER));
 		seq_printf(m, "Interrupt identity:  %08x\n",
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -978,15 +978,21 @@ static int i915_probe_agp(struct drm_dev
 	 * Some of the preallocated space is taken by the GTT
 	 * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
 	 */
-	if (IS_G4X(dev) || IS_PINEVIEW(dev) || IS_IRONLAKE(dev))
+	if (IS_G4X(dev) || IS_PINEVIEW(dev) || IS_IRONLAKE(dev) || ...
[ message continues ]
[view original message]
From: Eric Anholt
Subject: Re: [003/117] drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.
Date: Monday, May 10, 2010 - 7:47 pm

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvoxVgACgkQHUdvYGzw6vfv4gCfdMBPPx3PAgJmmFsW/oy6TeT+
WZwAn2fIqJ/0klBOV91gV0W9ClJZFWYS
=fT3l
-----END PGP SIGNATURE-----
[ message continues ]
[view original message]
From: Greg KH
Subject: Re: [003/117] drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.
Date: Tuesday, May 11, 2010 - 8:04 am

Ok, thanks, I've dropped this hunk from the patch now.

greg k-h
--


[ message continues ]
Previous thread: [001/117] USB: EHCI: defer reclamation of siTDs by Greg KH on Monday, May 10, 2010 - 3:31 pm. (1 message)

Next thread: [012/117] flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO by Greg KH on Monday, May 10, 2010 - 3:31 pm. (1 message)