Skip to contentSkip to conversation

drm-intel-next for 3.5

GIT PULL Daniel Vetter 1 participant 1 message Apr 12, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Forwarding the pull request to Dave to intel-gfx and dri-devel, I've fumbled the cc list on the original mail.
-Daniel

---------- Forwarded message ----------
From: Daniel Vetter <[email protected]>
Date: Thu, Apr 12, 2012 at 11:17
Subject: [pull] drm-intel-next for 3.5
To: Dave Airlie <[email protected]>

Hi Dave

First pull request for 3.5-next, slightly large than usual because new things kept coming in since the last pull for 3.4.
Highlights:
- first batch of hw enablement for vlv (Jesse et al) and hsw (Eugeni). pci ids are not yet added, and there's still quite a few patches to merge (mostly modesetting). To make QA easier I've decided to merge this stuff in pieces.
- loads of cleanups and prep patches spurred by the above. Especially vlv is a real frankenstein chip, but also hsw is stretching our driver's code design. Expect more to come in this area for 3.5.
- more gmbus fixes, cleanups and improvements by Daniel Kurtz. Again, there are more patches needed (and some already queued up), but I wanted to split this a bit for better testing.
- pwrite/pread rework and retuning. This series has been in the works for a few months already and a lot of i-g-t tests have been created for it. Now it's finally ready to be merged.  Note that one patch in this series touches include/pagemap.h, that patch is acked-by akpm.
- reduce mappable pressure and relocation throughput improvements from Chris.
- mmap offset exhaustion mitigation by Chris Wilson.
- a start at figuring out which codepaths in our messy dri1/ums+gem/kms driver we actually need to support by bailing out of unsupported case. The driver now refuses to load without kms on gen6+ and disallows a few ioctls that userspace never used in certain cases. More of this will definitely come.
- More decoupling of global gtt and ppgtt.
- Improved dual-link lvds detection by Takashi Iwai.
- Shut up the compiler + plus fix the fallout (Ben)
- Inverted panel brightness handling (mostly Acer manages to break things in this way).
- Small fixlets and adjustements and some minor things to help debugging.

Regression-wise QA reported quite a few issues on ivb, but all of them turned out to be hw stability issues which are already fixed in drm-intel-fixes (QA runs the nightly regression tests on -next alone, without -fixes automatically merged in). There's still one issue open on snb, it looks like occlusion query writes are not quite as cache coherent as we've expected. With some of the pwrite adjustements we can now reliably hit this. Kernel workaround for it is in the works.

QA (and myself) also had some fun with resume regressions introduced by upstream 3.4-rc1, but they all seem to be fixed in -rc2.

Yours, Daniel

The following changes since commit c501ae7f332cdaf42e31af30b72b4b66cbbb1604:

 drm/i915: Only clear the GPU domains upon a successful finish (2012-03-01 21:36:13 +0100)

are available in the git repository at:

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

for you to fetch changes up to ec34a01de31128e5c08e5f05c47f4a787f45a33c:

 drm/i915: VCS is not the last ring (2012-04-09 18:04:10 +0200)

----------------------------------------------------------------
Adam Jackson (2):
     drm/i915: Pull MTRR setup to its own function drm/i915: Don't do MTRR setup if PAT is enabled

Ben Widawsky (5):
     drm/i915: [dinq] shut up two instances -Wunitialized drm/i915: [dinq] shut up six instances of -Warray-bounds drm/i915: ring irq cleanups
     drm/i915: open code gen6+ ring irqs
     drm/i915: VCS is not the last ring

Carsten Emde (3):
     drm/i915: panel: invert brightness via parameter drm/i915: panel: invert brightness via quirk drm/i915: panel: invert brightness acer aspire 5734z

Chris Wilson (5):
     drm/i915: Release the mmap offset when purging a buffer drm/i915: Batch copy_from_user for relocation processing drm/i915: Avoid using mappable space for relocation processing through the CPU
     drm/i915: Initialise GTT MTRR to -1
     drm/i915/sdvo: Include YRPB as an additional TV output type

Daniel Kurtz (7):
     drm/i915/intel_i2c: refactor gmbus_xfer
     drm/i915/intel_i2c: cleanup error messages and comments drm/i915/intel_i2c: assign HDMI port D to pin pair 6 drm/i915/intel_i2c: use i2c pre/post_xfer functions to setup gpio xfers drm/i915/intel_i2c: refactor using intel_gmbus_get_adapter drm/i915/intel_i2c: gmbus disabled and reserved ports are invalid drm/i915/intel_i2c: allocate gmbus array as part of drm_i915_private

Daniel Vetter (38):
     drm/i915: split out dma mapping from global gtt bind/unbind functions drm/i915: bind objects to the global gtt only when needed drm/i915: implement SNB workaround for lazy global gtt drm/i915: enable lazy global-gtt binding
     drm/i915: add HAS_ALIASING_PPGTT parameter for userspace drm/i915/sdov: switch IS_SDVOB to a flag
     drm/i915: add an explict mmio base for gpio/gmbus io drm/i915: enable gmbus on gen2
     drm/i915: reinstate GM45 TV detection fix
     drm/i915: s/i915_gem_do_init/i915_gem_init_global_gtt drm/i915: the intel gtt is _not_ an agp bridge!
     drm/i915: clear the entire gtt when using gem
     drm/i915: merge shmem_pwrite slow&fast-path
     drm/i915: merge shmem_pread slow&fast-path
     drm: add helper to clflush a virtual address range drm/i915: move clflushing into shmem_pread
     drm/i915: kill ranged cpu read domain support
     drm/i915: don't use gtt_pwrite on LLC cached objects drm/i915: don't call shmem_read_mapping unnecessarily drm/i915: drop gtt slowpath
     drm/i915: don't clobber userspace memory before commiting to the pread drm/i915: implement inline clflush for pwrite
     drm/i915: fall back to shmem pwrite when the buffer is not accessible drm/i915: use uncached writes in pwrite
     drm/i915: extract copy helpers from shmem_pread|pwrite
     mm: extend prefault helpers to fault in more than PAGE_SIZE drm/i915: fixup in-line clflushing on bit17 swizzled bos drm/i915: mark pwrite/pread slowpaths with unlikely drm/i915: split LVDS update code out of i9xx_crtc_mode_set drm/i915: split PLL update code out of i9xx_crtc_mode_set drm/i915: rip out old HWSTAM missed irq WA for vlv drm/i915: use render gen to switch ring irq functions drm/i915: extract gt interrupt handler
     drm/i915: refuse to load on gen6+ without kms
     drm/i915: disallow gem init ioctl on ilk
     drm/i915: dump the DMA fetch addr register on pre-gen6 drm/i915: make quirks more verbose
     drm/i915: Add a dual link lvds quirk for MacBook Pro 8,2

Eugeni Dodonov (19):
     drm/i915: transform HAS_PCH_SPLIT in a feature check drm/i915: add Haswell devices and their PCI IDs drm/i915: add support for LynxPoint PCH
     drm/i915: add support for power wells
     drm/i915: add enumeration for DDI ports
     drm/i915: add DDI registers
     drm/i915: add DP_TP_CTL registers
     drm/i915: add DP_TP_STATUS registers
     drm/i915: add definitions for DDI_BUF_CTL registers drm/i915: add definition of DDI buffer translations regs drm/i915: add SBI registers
     drm/i915: add PIXCLK_GATE register
     drm/i915: add S PLL control
     drm/i915: add port clock selection support for HSW drm/i915: add SSC offsets for SBI access
     drm/i915: add LCPLL control registers
     drm/i915: add WRPLL clocks
     drm/i915: add WM_LINETIME registers
     drm/i915: add SFUSE_STRAP registers for digital port detection

Gajanan Bhat (1):
     drm/i915: program drain latency regs on ValleyView

Jesse Barnes (14):
     drm/i915: remove ACPI related DRM_ERRORs
     drm/i915: move NEEDS_FORCE_WAKE to i915_drv.c drm/i915: re-order GT IIR bit definitions
     drm/i915: add ValleyView driver structs and IS_VALLEYVIEW macro drm/i915: ValleyView watermark support
     drm/i915: PLL defines for VLV
     drm/i915: add DPIO support
     drm/i915: add ValleyView clock gating init agp/intel: map more registers for use by the GTT code agp/intel: add ValleyView AGP driver
     drm/i915: add ValleyView specific force wake get/put functions drm/i915: interrupt bit definitions for VLV drm/i915: ValleyView IRQ support
     drm/i915: check for disabled interrupts on ValleyView

Joe Perches (1):
     i915: Add and use pr_fmt and pr_<level>

Mathias Fröhlich (1):
     i915: Add option to bypass vbt table.

Sean Paul (2):
     drm/i915: Retry reading the PCH FDI receiver ISR drm/i915: Add wait_for in init_ring_common

Shobhit Kumar (1):
     drm/i915: Enable HDMI on ValleyView

Takashi Iwai (2):
     drm/i915: Check VBIOS value for determining LVDS dual channel mode, too drm/i915: Add lvds_channel module option

 Documentation/kernel-parameters.txt        |   14 +

 drivers/char/agp/intel-agp.c               |    1 +
 drivers/char/agp/intel-agp.h               |   14 +
 drivers/char/agp/intel-gtt.c               |   45 ++-
 drivers/gpu/drm/drm_cache.c                |   23 +
 drivers/gpu/drm/i915/i915_debugfs.c        |   91 +++-
 drivers/gpu/drm/i915/i915_dma.c            |   85 ++--
 drivers/gpu/drm/i915/i915_drv.c            |   88 +++-
 drivers/gpu/drm/i915/i915_drv.h            |   74 ++-
 drivers/gpu/drm/i915/i915_gem.c            |  824 +++++++++++-----------------

 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   94 +++- drivers/gpu/drm/i915/i915_gem_gtt.c        |   69 ++- drivers/gpu/drm/i915/i915_irq.c            |  450 +++++++++++++--- drivers/gpu/drm/i915/i915_reg.h            |  389 +++++++++++++-

 drivers/gpu/drm/i915/intel_acpi.c          |    2 -
 drivers/gpu/drm/i915/intel_bios.c          |   45 ++-
 drivers/gpu/drm/i915/intel_crt.c           |   16 +-
 drivers/gpu/drm/i915/intel_display.c       |  784 ++++++++++++++++++++-------
 drivers/gpu/drm/i915/intel_drv.h           |   17 +-
 drivers/gpu/drm/i915/intel_dvo.c           |    6 +-
 drivers/gpu/drm/i915/intel_hdmi.c          |   46 ++-
 drivers/gpu/drm/i915/intel_i2c.c           |  295 ++++++-----
 drivers/gpu/drm/i915/intel_lvds.c          |   11 +-

 drivers/gpu/drm/i915/intel_modes.c         |    3 +- drivers/gpu/drm/i915/intel_opregion.c      |    4 +- drivers/gpu/drm/i915/intel_panel.c         |   28 +- drivers/gpu/drm/i915/intel_ringbuffer.c    |   92 +--- drivers/gpu/drm/i915/intel_ringbuffer.h    |    1 + drivers/gpu/drm/i915/intel_sdvo.c          |   51 +- drivers/gpu/drm/i915/intel_tv.c            |    9 + include/drm/drmP.h                         |    1 + include/drm/i915_drm.h                     |    3 +- include/linux/pagemap.h                    |   64 +++-

 33 files changed, 2602 insertions(+), 1137 deletions(-)

--
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48

Signature · 2 lines
Daniel Vetter
[email protected] - +41 (0) 79 364 57 48 - http://blog.ffwll.ch