Skip to contentSkip to conversation

Updated -next

DISCUSSION Daniel Vetter 1 participant 2 messages Jun 4, 2012 – Jun 12, 2012

lore
Share & tools
lore
#0 lore raw

Hi all,

3.6 merging is already fully engaged, so here's a new -next to shred. I've pushed updated -next and -testing branches, as usual. Highlights:
- new wait_rendring_timeout interface (Ben)
- l3 cache remapping and error uevent support (Ben)
- even more infoframes work from Paulo
- gen4 hotplug rework from Chris
- prep work to make Laurent Pincharts original mode constification for connector->mode_fixup possible

Happy testing!

Yours, Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48
#1 lore raw

Hi Dave,

rc2 is out the door so I've figured I'll annoy you with the first -next pull request for 3.6 already. Highlights:
- new wait_rendring_timeout interface (Ben)
- l3 cache remapping and error uevent support (Ben)
- even more infoframes work from Paulo
- gen4 hotplug rework from Chris
- prep work to make Laurent Pincharts original mode constification for connector->mode_fixup possible

QA reported a few new bugs this time around, but no regressions afact. For 3.5 the only thing I'm aware of is the edp vdd dmesg spam Linus originally reported - it looks like that might have been introduced in 3.5. But somehow my brain is routinely offline when I work on that issue, so things seem to take forever (and atm I'm at patch v4 for that little problem).

Yours, Daniel

The following changes since commit 63bc620b45af8c743ac291c8725933278c712692:

radeon: add radeon prime vmap support. (2012-05-31 14:14:01 +0100)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-06-04

for you to fetch changes up to 1523c310b3ed964b71a8db16f70c3bc21cc0642e:

drm/i915: add min freq control to debugfs (2012-06-04 21:34:47 +0200)

----------------------------------------------------------------
Ben Widawsky (8):
drm/i915: timeout parameter for seqno wait drm/i915: improve i915_wait_request_begin trace drm/i915: wait render timeout ioctl drm/i915: s/i915_wait_request/i915_wait_seqno/g drm/i915: Dynamic Parity Detection handling drm/i915: enable parity error interrupts drm/i915: remap l3 on hw init
drm/i915: l3 parity sysfs interface

Chris Wilson (6):
drm/i915: All members of gen4 have hotplug, so unconditionally enable its irq drm/i915: Inspect the right status bits for DP/HDMI hotplug on gen4 drm/i915: SDVO hotplug have different interrupt status bits for i915/i965/g4x drm/i915/hdmi: Query the live connector status bit for G4x drm/i915/dp: For consistency use the DP hotplug synonyms drm/i915/hdmi: Fix reg values for g4x_hdmi_connected

Daniel Vetter (14):
drm/i915: clarify preferred sdvo input mode code
drm/i915: don't silently ignore sdvo mode_set failures
drm/i915: there's no cxsr on ilk
drm/i915: reuse the sdvo tv clock adjustment in ilk mode_set drm/i915: s/mdelay/msleep/ in the sdvo detect function
drm/i915: ivybridge_handle_parity_error should be static
drm/i915: initialize the parity work only once
drm/i915: simplify sysfs setup code
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued drm/i915: clarify IBX dp workaround
drm/i915: extract object active state flushing code
drm/i915: compute the target_clock for edp directly
drm/i915: adjusted_mode->clock in the dp mode_fixup
drm/i915: don't chnage the original mode in dp_mode_fixup

Jesse Barnes (1):
drm/i915: add min freq control to debugfs

Paulo Zanoni (11):
drm/i915: add set_infoframes to struct intel_hdmi drm/i915: properly alternate between DVI and HDMI drm/i915: only set the HDMI port on the DIP once drm/i915: enable DIP before enabling each InfoFrame drm/i915: don't wait for vblank while writing InfoFrames drm/i915: explicitly disable the DIPs we're not using drm/i915: disable DIP while changing the port drm/i915: don't write 0 to DIP control at HDMI init drm/i915: don't set SDVO_BORDER_ENABLE when we're HDMI drm/i915: remove comment about HSW HDMI DIPs drm/i915: add some barriers when changing DIPs

 drivers/gpu/drm/i915/i915_debugfs.c     |   66 +++++++
 drivers/gpu/drm/i915/i915_dma.c         |    1 +
 drivers/gpu/drm/i915/i915_drv.h         |   11 +-
 drivers/gpu/drm/i915/i915_gem.c         |  242 +++++++++++++++++++----
 drivers/gpu/drm/i915/i915_irq.c         |  171 ++++++++++++-----
 drivers/gpu/drm/i915/i915_reg.h         |   56 +++++-
 drivers/gpu/drm/i915/i915_sysfs.c       |  127 +++++++++++-
 drivers/gpu/drm/i915/i915_trace.h       |   28 ++-
 drivers/gpu/drm/i915/intel_ddi.c        |    3 +-
 drivers/gpu/drm/i915/intel_display.c    |   47 ++---
 drivers/gpu/drm/i915/intel_dp.c         |   53 +++---
 drivers/gpu/drm/i915/intel_drv.h        |    9 +-
 drivers/gpu/drm/i915/intel_hdmi.c       |  318 +++++++++++++++++++++++++------
 drivers/gpu/drm/i915/intel_overlay.c    |    4 +-
 drivers/gpu/drm/i915/intel_panel.c      |    2 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c |   16 +-
 drivers/gpu/drm/i915/intel_sdvo.c       |   56 ++++--
 include/drm/i915_drm.h                  |   10 +
 18 files changed, 965 insertions(+), 255 deletions(-)
Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48