From patchwork Wed Oct 10 21:13:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1575931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 37808DFB34 for ; Wed, 10 Oct 2012 22:22:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BA72A0C21 for ; Wed, 10 Oct 2012 15:22:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id EF06A9E80C for ; Wed, 10 Oct 2012 15:22:11 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so6381989wib.12 for ; Wed, 10 Oct 2012 15:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=Z4TRYp4jN0F3axkwG1CMcIaqorbhLtqxrak2IM8SSqg=; b=lSQd93mnx/yhwfc3EUyjUUnqU4yibju+30jarlGnLmtqeXvJXAugodYrtUNCLF0rO/ dUwHBhJIcSRl+JECLSn3emu1AVn236TbXbiw7QpKTd8Ree2fHeJDeYqfJci5b2Vjnd+s fomtMW8sOMAdZ8AwSOyqYrmLlp/+uMvvev6wg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=Z4TRYp4jN0F3axkwG1CMcIaqorbhLtqxrak2IM8SSqg=; b=Nxl8/XhBLMIwL/gGP3MgvNnTK9oNa1PUBrXWiXxSjT3poMEeyWcgkYWVTYWHVTPTip PPkRX/osO+w17PHwSmLq3SO6IVNMXHOwKxLgavIXEf20B7SQNRBYFqm7BVNNdHLQWBRv l2XLOzCixoC91hwCnKMIR3rXZoQe/t86wtRMJPWAXj7tqlU9Y9pEzFDl9IQFUJ5t7zJ4 9EHTFffFeVYZ+Ogve50JN+x/fnZ6qwakGARqljml3rTnnqvvXoSvACknTeVRx1kJZuB9 g92d81kp3iSBMY0J6BB5hv3zeukShc7e4UDeOfXXJRXw6D7OO0gLR9rsGz4BHARECXSQ HVbw== Received: by 10.180.93.33 with SMTP id cr1mr16026839wib.8.1349907730756; Wed, 10 Oct 2012 15:22:10 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id ei1sm5143670wid.7.2012.10.10.15.22.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 15:22:10 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 10 Oct 2012 23:13:59 +0200 Message-Id: <1349903641-18378-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 X-Gm-Message-State: ALoCoQkyvDoBP00vd2Jnrs8IJxqPIQUl6TfRPbE7Kmp1u3/twBmrRN3wA9j4EtwBwuO6IvtMbssV Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/3] drm/i915: rip out the pipe A quirk for i855gm X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org This seems to be the root-cause that breaks resume on my i855gm when I apply the "drm/i915: fixup the plane->pipe fixup code" patch. And that code doesn't even run on my machine, so it's pure timing changes causing the regression. Furthermore resume has been constantly switching between working and broken on this machine ever since kms support has been merged, seemingly with no related change as a root cause. And always with the same symptoms of the backlight lighting up, but the lvds panel only displaying black. Also, of both i855gm variants only one is in the table. And in the past we've only ever removed entries from this quirk table because it breaks things. So let's just remove it - in case there's indeed a bios out there relying on a running pipe A, we can add back in a more precise quirk entry, like all the others (save for i830/i845). Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8d51e52..735f8d7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7790,8 +7790,7 @@ static struct intel_quirk intel_quirks[] = { /* ThinkPad T60 needs pipe A force quirk (bug #16494) */ { 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, - /* 855 & before need to leave pipe A & dpll A up */ - { 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, + /* 830/845 need to leave pipe A & dpll A up */ { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },