From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [pull] drm-intel-fixes Date: Thu, 10 Jan 2013 18:14:37 +0100 Message-ID: <20130110171437.GF5737@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id DB3E1E5C80 for ; Thu, 10 Jan 2013 09:12:38 -0800 (PST) Received: by mail-wg0-f52.google.com with SMTP id 12so381932wgh.19 for ; Thu, 10 Jan 2013 09:12:38 -0800 (PST) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org Hi Dave, Pretty much all just major fixes: - 2 pieces of duct-tape for the ilk bug. - Sprite regression fixes from Chris. - OOPS fix for a div-by-zero from Chris, regression due to the modeset rework in 3.7, now brought to light by a benign change in 3.8. - Fix interrupted bo pinning, used to work around CS coherency issues on i830/i845 (kernel also has a w/a newly in 3.8, but pinning is more efficient if possible). Cheers, Daniel The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed: Linux 3.8-rc2 (2013-01-02 18:13:21 -0800) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes for you to fetch changes up to 93927ca52a55c23e0a6a305e7e9082e8411ac9fa: drm/i915: Revert shrinker changes from "Track unbound pages" (2013-01-10 18:02:44 +0100) ---------------------------------------------------------------- Chris Wilson (6): drm/i915; Only increment the user-pin-count after successfully pinning the bo drm/i915: Treat crtc->mode.clock == 0 as disabled drm: Only evict the blocks required to create the requested hole drm/i915: The sprite scaler on Ironlake also support YUV planes drm/i915: Add DEBUG messages to all intel_create_user_framebuffer error paths drm/i915: Use pixel size for computing linear offsets into a sprite Daniel Vetter (2): Revert "drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13" drm/i915: Revert shrinker changes from "Track unbound pages" drivers/gpu/drm/drm_mm.c | 45 +++++++++++++--------------------- drivers/gpu/drm/i915/i915_gem.c | 25 +++++++++++++------ drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++------ drivers/gpu/drm/i915/intel_lvds.c | 8 ------ drivers/gpu/drm/i915/intel_pm.c | 25 ++++++++++++------- drivers/gpu/drm/i915/intel_sprite.c | 10 +++----- include/drm/drm_mm.h | 2 +- 7 files changed, 81 insertions(+), 67 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch