Here's most of the patches I'm hoping to land in 2.6.40:
* Ivybridge support (Gen7) * Forcewake fixes for Sandybridge (And ivybridge). * Temporary FB for load detect (hoping for some cleanups here)
Still pending:
* More modesetting cleanups (as always) * Disabling FBC on Ironlake to enable RC6 instead
This sequence also assigns me as the the drm/i915 maintainer.
The following changes since commit 2fb4e61d9471867677c97bf11dba8f1e9dfa7f7c:
drm/i915/lvds: Only act on lid notify when the device is on (2011-05-09 09:13:22 -0700)
are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Ben Widawsky (10): drm/i915: fix ilk rc6 teardown locking drm/1915: ringbuffer wait for idle function drm/i915: fix rc6 initialization on Ironlake drm/i915: debugfs for context information drm/i915: proper use of forcewake drm/i915: reference counted forcewake drm/i915: forcewake struct mutex locking fixes drm/i915: move gen6 rps handling to workqueue drm/i915: debugfs interface for forcewake reference count drm/i915: forcewake debugfs fix
Chris Wilson (12): drm/i915: Move the irq wait queue initialisation into the ring init drm/i915: Simplify return value from intel_get_load_detect_pipe drm/i915: Propagate failure to set mode for load-detect pipe drm/i915: Don't store temporary load-detect variables in the generic encoder drm/i915: Remove unused supported_crtc from intel_load_detect_pipe drm/i915: Pass the saved adjusted_mode when adding to the load-detect crtc drm/i915: Remove dead code from intel_get_load_detect_pipe() drm/i915: Remove dead code from intel_release_load_detect_pipe() drm/i915: Attach a fb to the load-detect pipe drm/i915: Rename agp_type to cache_level drm/i915: Do not clflush snooped objects drm/i915: Disable all outputs early, before KMS takeover
Eric Anholt (12): drm/i915: Split the crtc_mode_set function along HAS_PCH_SPLIT() lines. drm/i915: Move the vblank pre/post modeset to the common crtc_mode_set. drm/i915: Remove the PCH paths from the pre-Ironlake crtc_mode_set(). drm/i915: Drop the eDP paths from the pre-Ironlake crtc_mode_set. drm/i915: Drop the remaining bit of Ironlake code from i9xx_crtc_mode_set(). drm/i915: Drop non-HAS_PCH_SPLIT() code from ironlake_crtc_mode_set(). drm/i915: Drop remaining pre-Ironlake code from ironlake_crtc_mode_set(). drm/i915: Clean up leftover DPLL and LVDS register choice from pch split. drm/i915: Fold the DPLL limit defines into the structs that use them. drm/i915: Use existing function instead of open-coding fence reg clear. drm/i915: Add support for fence registers on Ivybridge. drm/i915: Update the location of the ringbuffers' HWS_PGA registers for IVB.
Jesse Barnes (20): drm/i915: use i915_enable_rc6 on SNB too drm/i915: make FDI training a display function drm/i915: split irq handling into per-chipset functions drm/i915: split enable/disable vblank code into chipset specific functions drm/i915: add IS_GEN7 macro to cover Ivy Bridge and later drm/i915: add IS_IVYBRIDGE macro for checks drm/i915: Ivy Bridge has split display and pipe control drm/i915: add swizzle/tiling support for Ivy Bridge drm/i915: manual FDI training for Ivy Bridge drm/i915: treat Ivy Bridge watermarks like Sandy Bridge drm/i915: interrupt & vblank support for Ivy Bridge drm/i915: page flip support for Ivy Bridge drm/i915: ring support for Ivy Bridge agp/intel: add Ivy Bridge support drm/i915: add PantherPoint PCH ID drm/i915: add Ivy Bridge PCI IDs and driver feature structs drm/i915: set IBX pch type explicitly drm/i915: split clock gating init into per-chipset functions drm/i915: add Ivybridge clock gating init function drm/i915: split PCH clock gating init
Keith Packard (1): MAINTAINERS: Switch maintainer for drm/i915 to Keith Packard
MAINTAINERS | 4 +- drivers/char/agp/intel-agp.c | 3 + drivers/char/agp/intel-agp.h | 8 + drivers/char/agp/intel-gtt.c | 10 + drivers/gpu/drm/i915/i915_debugfs.c | 128 ++- drivers/gpu/drm/i915/i915_dma.c | 60 +- drivers/gpu/drm/i915/i915_drv.c | 61 +- drivers/gpu/drm/i915/i915_drv.h | 111 +- drivers/gpu/drm/i915/i915_gem.c | 36 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 35 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 310 ++++- drivers/gpu/drm/i915/i915_reg.h | 35 +- drivers/gpu/drm/i915/i915_suspend.c | 3 +- drivers/gpu/drm/i915/intel_crt.c | 24 +- drivers/gpu/drm/i915/intel_display.c | 2370 ++++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 19 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +- drivers/gpu/drm/i915/intel_tv.c | 13 +- 20 files changed, 2124 insertions(+), 1181 deletions(-)
I've pushed four more patches to this branch for your merging pleasure.
- Disabling FBC on Ironlake to enable RC6 instead
Two patches for this are included.
The following changes since commit 645c62a5e95a5f9a8e0d0627446bbda4ee042024:
drm/i915: split PCH clock gating init (2011-05-13 18:12:53 -0700)
are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Feng, Boqun (2): drm/i915: fix user irq miss in BSD ring on g4x drm/i915: clean up unused ring_get_irq/ring_put_irq functions
Jesse Barnes (2): drm/i915: add fbc enable flag, but disable by default drm/i915: enable rc6 by default
drivers/gpu/drm/i915/i915_debugfs.c | 3 ++ drivers/gpu/drm/i915/i915_drv.c | 7 +++- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_display.c | 5 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 50 ++++++++++++++---------------- 5 files changed, 38 insertions(+), 29 deletions(-)
On Tue, 17 May 2011 15:00:01 -0700, Keith Packard keithp@keithp.com wrote:
I've pushed four more patches to this branch for your merging pleasure.
And, one more which fixes non-eDP displays on Ironlake systems after the Ivybridge merge. Sorry for not catching that in our testing...
The following changes since commit a51f7a66fb5e4af5ec4286baef940d06594b59d2:
drm/i915: enable rc6 by default (2011-05-17 14:33:38 -0700)
are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Keith Packard (1): drm/i915: FDI link training broken on Ironlake by Ivybridge integration
drivers/gpu/drm/i915/intel_display.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
This fixes a simple typo in the Ivybridge code -- an extra semicolon.
The following changes since commit 9e3c256d7d56a12a3242222945ce8e6347f93fa0:
drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge (2011-05-18 15:14:39 -0700)
are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Dan Carpenter (1): drm/i915: fix if statement in ivybridge irq handler
drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Here's another handful of fixes that I had merged to drm-intel-next. Once these are merged, I'll move drm-intel-fixes and start putting stuff there for 3.0.
The following changes since commit 9e3c256d7d56a12a3242222945ce8e6347f93fa0:
drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge (2011-05-18 15:14:39 -0700)
are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-next
Chris Wilson (5): drm/i915: s/addr & ~PAGE_MASK/offset_in_page(addr)/ drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0 drm/i915/crt: Explicitly return false if connected to a digital monitor drm/i915: Remove unused enum "chip_family" drm/i915: Share the common force-audio property between connectors
Dan Carpenter (1): drm/i915: fix if statement in ivybridge irq handler
Daniel Vetter (3): drm/i915: Only print out the actual number of fences for i915_error_state drm/i915: not finding a fence is a non-recoverable condition drm/915: fix relaxed tiling on gen2: tile height
Jason Stubbs (1): drm/i915: fix regression after clock gating init split
Nicolas Kaiser (1): drm: i915: correct return status in intel_hdmi_mode_valid()
drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 +--- drivers/gpu/drm/i915/i915_gem.c | 28 +++++----- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 4 ++ drivers/gpu/drm/i915/intel_display.c | 89 ++++++++-------------------------- drivers/gpu/drm/i915/intel_dp.c | 15 +----- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 16 +----- drivers/gpu/drm/i915/intel_modes.c | 30 +++++++++++ drivers/gpu/drm/i915/intel_sdvo.c | 14 +----- 11 files changed, 80 insertions(+), 129 deletions(-)
dri-devel@lists.freedesktop.org
-
Keith Packard