From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 2/3] drm/i915: fixup the plane->pipe fixup code Date: Thu, 11 Oct 2012 09:03:21 +0100 Message-ID: <84c8a8$62orsq@orsmga001.jf.intel.com> References: <1349903641-18378-1-git-send-email-daniel.vetter@ffwll.ch> <1349903641-18378-2-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id A7E429E7D2 for ; Thu, 11 Oct 2012 01:03:31 -0700 (PDT) In-Reply-To: <1349903641-18378-2-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Wed, 10 Oct 2012 23:14:00 +0200, Daniel Vetter wrote: > We need to check whether the _other plane is on our pipe, not whether > our plane is on the other pipe. Otherwise if not both pipes/planes are > active, we won't properly clean up the mess and set up our desired > plane->pipe mapping. > > v2: Fixup the logic, I've totally fumbled it. Noticed by Chris Wilson. > > v3: I've checked Bspec, and the flexible plane->pipe mapping is a > gen2/3 feature, so test for that instead of PCH_SPLIT > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51265 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49838 > Tested-by: Dave Airlie > Signed-off-by: Daniel Vetter With these patches applied my 855gm is still in good working order (the best it has been). Though I'm still spammed by modeset_check failing in every possible way! Tested-by: Chris Wilson #855gm -Chris -- Chris Wilson, Intel Open Source Technology Centre