From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PULL] drm-intel-fixes Date: Thu, 7 Nov 2013 10:03:52 +0100 Message-ID: <20131107090352.GA26059@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: intel-gfx@lists.freedesktop.org Hi Dave, Bit a bit -fixes pull request in the merge window than usual dua to two feauture-y things: - Display CRCs are now enabled on all platforms, including the odd DP case on gm45/vlv. Since this is a testing-only feature it should ever hurt, but I figured it'll help with regression-testing -fixes. So I left it in and didn't postpone it to 3.14. - Display power well refactoring from Imre. Would have caused major pain conflict with the bdw stage 1 patches if I'd postpone this to -next. It's only an relatively small interface rework, so shouldn't cause pain. It's also been in my tree since almost 3 weeks already. That accounts for about two thirds of the pull, otherwise just bugfixes: - vlv backlight fix from Jesse/Jani - vlv vblank timestamp fix from Jesse - improved edp detection through vbt from Ville (fixes a vlv issue) - eDP vdd fix from Paulo - fixes for dvo lvds on i830M - a few smaller things all over Note: This contains a backmerge of v3.12. Since the -internal branch always applied on top of -nightly I need that unified base to merge bdw patches. So you'll get a conflict with radeon connector props when pulling this (and nouveau/master will also conflict a bit when Ben doesn't rebase). The backmerge itself only had conflicts in drm/i915. There's also a tiny conflict between Jani's backlight fix and your sysfs lifetime fix in drm-next. I plan to send you the bdw pull request tomorrow. Cheers, Daniel The following changes since commit 6da7f10d296f4ac625f96b39eef22c41398727e3: drm/i915/dp: don't mention eDP bpp clamping if it doesn't affect bpp (201= 3-10-18 16:00:06 +0200) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-= 11-07 for you to fetch changes up to 07bf139b906013ecef0c5e0441564d1ae10e974a: drm/i915/vlv: use per-pipe backlight controls v2 (2013-11-06 18:26:31 +01= 00) ---------------------------------------------------------------- Ben Widawsky (4): drm/i915: Print RC6 info less often drm/i915: Convert straggling MCHBAR registers drm/i915: Remove WaFbcDisableDpfcClockGating on IVB drm/i915: Remove WaFbcDisableDpfcClockGating on HSW Chon Ming Lee (1): drm/i915/vlv: Fix typo in the DPIO register define. Chris Wilson (2): drm/i915: Whitespace alignment fix for block header in display error = state drm/i915: Capture batchbuffer state upon GPU hang Damien Lespiau (1): drm/i915: Use a spin lock to protect the pipe crc struct Daniel Vetter (20): drm/i915: Adjust CRC capture for pre-gen5/vlv drm/i915: CRC source selection #defines for gmch/vlv chips drm/i915: Wire up CRC interrupts for pre-gen5/vlv drm/i915: Enable CRC interrupts on pre-gen5/vlv drm/i915: Fix PIPE_CRC_CTL for vlv drm/i915: Add new CRC sources drm/i915: Wire up CRC support for gen3/4 drm/i915: Wire up gen2 CRC support drm/i915: Wire up CRC for vlv drm/i915: bikeshed the pipe CRC irq functions a bit drm/i915: Move the pipe CRC stuff to other pipe data drm/i915: handle faked missed interrupts as simulated hangs, too drm/i915: use enum pipe consistently in i915_irq.c drm/i915: refactor ilk display interrupt handling drm/i916: add "auto" pipe CRC source drm/i915: scramble reset support for DP port CRC on g4x drm/i915: scramble reset support for DP port CRC on vlv drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv Merge tag 'v3.12' into drm-intel-next drm/i915/dvo: call ->mode_set callback only when the port is running Imre Deak (10): drm/i915: make the intel_display_power_domain enum compact drm/i915: factor out is_always_on_domain drm/i915: change power_well->lock to be mutex drm/i915: factor out modeset_update_power_wells drm/i915: enable only the needed power domains during modeset drm/i915: prepare for multiple power wells drm/i915: use power get/put instead of set for power on after init drm/i915: remove device field from struct power_well drm/i915: rename i915_init_power_well to init_power_domains_init drm/i915: add back checking for i915_disable_power_well Jani Nikula (1): drm/i915: move opregion asle request handling to a work queue Jesse Barnes (3): drm/i915/vlv: use PIPE_START_VBLANK interrupts on VLV drm/i915: make backlight functions take a connector drm/i915/vlv: use per-pipe backlight controls v2 Mengdong Lin (1): drm/i915/vlv: enable HDA display audio for Valleyview2 Paulo Zanoni (5): drm/i915: fix open-coded DIV_ROUND_UP drm/i915: turn the eDP VDD on for any i2c transactions drm/i915: reduce eDP VDD message verbose drm/i915: use the correct register when turning VDD off drm/i915: avoid unclaimed registers when capturing the error state Ville Syrj=E4l=E4 (3): drm/i915: Clamp cursor coordinates to int16_t range drm/i915: Give names to the VBT child device type bits drm/i915: Make intel_dp_is_edp() less specific -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch