Skip to contentSkip to conversation

drm-intel-next

GIT PULL Daniel Vetter 2 participants 2 messages Aug 4, 2014

lore
Share & tools
lore
#0 lore raw

Hi Dave,

Final feature pull for 3.17.

drm-intel-next-2014-07-25:
- Ditch UMS support (well just the config option for now)
- Prep work for future platforms (Sonika Jindal, Damien)
- runtime pm/soix fixes (Paulo, Jesse)
- psr tracking improvements, locking fixes, now enabled by default!
- rps fixes for chv (Deepak, Ville)
- drm core patches for rotation support (Ville, Sagar Kamble) - the i915 parts unfortunately didn't make it yet
- userptr fixes (Chris)
- minimum backlight brightness (Jani), acked long ago by Matthew Garret on irc - I've forgotten about this patch :(

QA is a bit unhappy about the DP MST stuff since it broke hpd testing a bit, but otherwise looks sane. I've backmerged drm-next to resolve conflicts with the mst stuff, which means the new tag itself doesn't contain the overview as usual.

Cheers, Daniel

The following changes since commit e05444be705b5c7c7f85d7722b6f97f3a6732d54:

drm/i915: fix initial fbdev setup warnings (2014-07-24 10:27:42 +1000)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-2014-07-25-merged

for you to fetch changes up to 4dac3edfe68e5e1b3c2216b84ba160572420fa40:

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next (2014-07-29 20:49:36 +0200)

----------------------------------------------------------------
Armin Reese (1):
drm/i915: Do not unmap object unless no other VMAs reference it

Ben Widawsky (2):
drm/i915/error: Check the potential ctx obj's vm drm/i915: Reorder ctx unref on ppgtt cleanup

Borun Fu (1):
drm/i915: Power gating display wells during i915_pm_suspend

Chris Wilson (5):
drm/i915: Handle failure to kick out a conflicting fb driver drm/i915: Abandon oom quickly if killed by a signal drm/i915: Initialise userptr mmu_notifier serial to 1 drm/i915: Allow overlapping userptr objects drm/i915/userptr: Keep spin_lock/unlock in the same block

Damien Lespiau (3):
drm/i915: PM irq enabling is generic on gen8, too drm/i915: Also give the sprite width for WM computation drm/i915: Make the WRPLL names const

Daniel Vetter (14):
drm/i915: ddi: enable runtime pm during dpms
drm/i915: Run psr_setup unconditionally
drm/i915: Add a FIXME about drrs/psr interactions drm/i915: Track the psr dp connector in dev_priv->psr.enabled drm/i915: Don't try to disable psr harder from the work item drm/i915: Lock down psr sw/hw state tracking
drm/i915: More checks for psr.enabled
drm/i915: Add locking to psr code
drm/i915: Fix up PSR frontbuffer tracking
drm/i915: Improve PSR debugfs output
drm/i915: Remove redundant HAS_PSR checks
drm/i915: Use genX_ prefix for gt irq enable/disable functions drm/i915: Ditch UMS config option
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Deepak S (9):
drm/i915: Read guaranteed freq for valleyview drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs drm/i915: populate mem_freq/cz_clock for chv drm/i915: CHV GPU frequency to opcode functions drm/i915/chv: Add basic PM interrupt support for CHV drm/i915: Add RP1 render P state thresholds in CHV drm/i915: Force GPU Freq to lowest while suspending. drm/i915/chv: Drop WaGsvBringDownFreqInRc6
drm/i915: Fix printing proper min/min/rpe values in debugfs

Fengguang Wu (1):
drm/i915: byt_gpu_freq() can be static

Jani Nikula (2):
drm/i915: extract backlight minimum brightness from VBT drm/i915: respect the VBT minimum backlight brightness

Jesse Barnes (5):
drm/i915: don't warn if IRQs are disabled when shutting down display IRQs drm/i915: add helper for checking whether IRQs are enabled drm/i915: set pm._irqs_disabled at IRQ init time
drm/i915: clear pm._irqs_disabled field after installing IRQs drm/i915: mark IRQs as disabled on unload

Mika Kuoppala (1):
drm/i915/chv: calculate rc6 residency correctly

Paulo Zanoni (7):
drm/i915: remove useless runtime PM get calls
drm/i915: don't write powered down IRQ registers on Gen 8 drm/i915: HSW_BLC_PWM2_CTL doesn't exist on BDW
drm/i915: extract and improve gen8_irq_power_well_post_enable drm/i915: reorganize the unclaimed register detection code drm/i915: BDW can also detect unclaimed registers drm/i915: remove plane/cursor/pipe assertions from intel_crtc_disable

Rodrigo Vivi (2):
drm/i915: Enable PSR by default.
drm/i915: Fix possible overflow when recording semaphore states.

Sagar Kamble (2):
Documentation: drm: Removing placeholders for generic drm properties description
Documentation: drm: describing rotation property

Sonika Jindal (8):
drm/i915: Adding HAS_GMCH_DISPLAY macro
drm/i915: Allowing changing of wm latencies for valid platforms drm/i915: Returning the right VGA control reg for platforms drm/i915: Writing proper check for reading of pipe status reg drm/i915: Avoid incorrect returning for some platforms drm/i915: Setting legacy palette correctly for different platforms drm/i915: Returning from increase/decrease of pllclock when invalid drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in

Vandana Kannan (4):
drm/crtc: Add property for aspect ratio drm/edid: Check for user aspect ratio input drm/i915: Add aspect ratio property for HDMI Documentation/drm: Describing aspect ratio property

Ville Syrjälä (9):
drm/i915: Don't disable PPGTT for CHV based in PCI rev drm/i915: Use the cached min/min/rpe values in the vlv debugfs code drm/i915: Call encoder->post_disable() in intel_sanitize_encoder()
drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h
drm: Add support_bits parameter to drm_property_create_bitmask()
drm: Add drm_mode_create_rotation_property()
drm/omap: Switch omapdrm over to drm_mode_create_rotation_property()
drm: Add drm_rect rotation functions
drm: Add drm_rotation_simplify()

 Documentation/DocBook/drm.tmpl          |  77 ++++--------
 drivers/gpu/drm/drm_crtc.c              |  98 ++++++++++++++-
 drivers/gpu/drm/drm_edid.c              |  10 +-
 drivers/gpu/drm/drm_rect.c              | 140 ++++++++++++++++++++++
 drivers/gpu/drm/i915/Kconfig            |  12 --
 drivers/gpu/drm/i915/i915_debugfs.c     |  35 +++---
 drivers/gpu/drm/i915/i915_dma.c         |  20 +++-
 drivers/gpu/drm/i915/i915_drv.c         |  11 +-
 drivers/gpu/drm/i915/i915_drv.h         |  29 +++--
 drivers/gpu/drm/i915/i915_gem.c         |  13 +-
 drivers/gpu/drm/i915/i915_gem_context.c |   6 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c     |   3 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c | 149 ++++++++++++++++-------
 drivers/gpu/drm/i915/i915_gpu_error.c   |  24 ++--
 drivers/gpu/drm/i915/i915_irq.c         |  68 +++++++----
 drivers/gpu/drm/i915/i915_params.c      |  10 +-
 drivers/gpu/drm/i915/i915_reg.h         |   8 +-
 drivers/gpu/drm/i915/i915_sysfs.c       |  57 +++++++--
 drivers/gpu/drm/i915/intel_bios.c       |   3 +-
 drivers/gpu/drm/i915/intel_crt.c        |   4 -
 drivers/gpu/drm/i915/intel_ddi.c        |   2 +-
 drivers/gpu/drm/i915/intel_display.c    |  78 ++++++------
 drivers/gpu/drm/i915/intel_dp.c         | 205 +++++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_drv.h        |  40 +++++--
 drivers/gpu/drm/i915/intel_hdmi.c       |  35 +++++-
 drivers/gpu/drm/i915/intel_opregion.c   |   2 +-
 drivers/gpu/drm/i915/intel_panel.c      | 160 ++++++++++++++++++++++---
 drivers/gpu/drm/i915/intel_pm.c         | 202 +++++++++++++++++++++++++------
 drivers/gpu/drm/i915/intel_ringbuffer.c |  12 +-
 drivers/gpu/drm/i915/intel_sprite.c     |  15 ++-
 drivers/gpu/drm/i915/intel_uncore.c     |  30 +++--
 drivers/gpu/drm/omapdrm/omap_drv.h      |   7 --
 drivers/gpu/drm/omapdrm/omap_plane.c    |  17 ++-
 include/drm/drm_crtc.h                  |  17 ++-
 include/drm/drm_rect.h                  |   6 +
 include/uapi/drm/drm_mode.h             |   5 +
 36 files changed, 1182 insertions(+), 428 deletions(-)
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#1 lore raw
Quoted 16 lines · Daniel Vetter

Hi Dave,

Final feature pull for 3.17.

drm-intel-next-2014-07-25:
- Ditch UMS support (well just the config option for now)
- Prep work for future platforms (Sonika Jindal, Damien)
- runtime pm/soix fixes (Paulo, Jesse)
- psr tracking improvements, locking fixes, now enabled by default!
- rps fixes for chv (Deepak, Ville)
- drm core patches for rotation support (Ville, Sagar Kamble) - the i915 parts unfortunately didn't make it yet
- userptr fixes (Chris)
- minimum backlight brightness (Jani), acked long ago by Matthew Garret on irc - I've forgotten about this patch :(

Quoted 4 lines

QA is a bit unhappy about the DP MST stuff since it broke hpd testing a bit, but otherwise looks sane. I've backmerged drm-next to resolve conflicts with the mst stuff, which means the new tag itself doesn't contain the overview as usual.

They are unhappy to do their job?

I'm a bit confused. :-P

Dave.