From patchwork Mon Jun 2 15:38:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Richter X-Patchwork-Id: 4283041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 869CB9F1D6 for ; Mon, 2 Jun 2014 15:38:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0905203AF for ; Mon, 2 Jun 2014 15:38:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4BC78203AB for ; Mon, 2 Jun 2014 15:38:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B9396E5B3; Mon, 2 Jun 2014 08:38:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from medousa.rus.uni-stuttgart.de (medousa.rus.uni-stuttgart.de [129.69.192.4]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C00E6E5B3 for ; Mon, 2 Jun 2014 08:38:24 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by medousa.rus.uni-stuttgart.de (Postfix) with ESMTP id 951AA37F34; Mon, 2 Jun 2014 17:38:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= rus.uni-stuttgart.de; h=content-type:content-type:in-reply-to :references:subject:subject:user-agent:reply-to:from:from:date :date:message-id:received:received; s=dkim20100209; t= 1401723495; x=1403537896; bh=u8DjMqrfZThpjk2pMoFAbyMeOTQOcrxk4A2 CDRQpVgk=; b=MjhXMEc652kymQoUbtHUj0zpnF2ExE5yd1i9N+hwKzt7z/oB+iV 8jrhkqpz9CNcBKFvHGCggqRsEx6Xw4DhH17RRoxxdjoQiFNnLCVSU77GAA+tmyTp 4/w4/AIs+pvOzFeVcuUw9Y9r5ycSFyvE7/N6U6qT4yOj5J1ef/Tv5D1A= X-Virus-Scanned: by amavisd-new at medousa.rus.uni-stuttgart.de Received: from medousa.rus.uni-stuttgart.de ([127.0.0.1]) by localhost (medousa.rus.uni-stuttgart.de [127.0.0.1]) (amavisd-new, port 10031) with ESMTP id KTWwpHf60zxX; Mon, 2 Jun 2014 17:38:15 +0200 (CEST) Received: from [192.168.3.46] (p5B2ED774.dip0.t-ipconnect.de [91.46.215.116]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: ac105036) by medousa.rus.uni-stuttgart.de (Postfix) with ESMTPSA; Mon, 2 Jun 2014 17:38:15 +0200 (CEST) Message-ID: <538C9A65.1050704@rus.uni-stuttgart.de> Date: Mon, 02 Jun 2014 17:38:13 +0200 From: Thomas Richter User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0.12) Gecko/20130116 Icedove/10.0.12 MIME-Version: 1.0 To: Daniel Vetter References: <53761A88.1060608@math.tu-berlin.de> <20140516144104.GE3473@nuc-i3427.alporthouse.com> <20140516150953.GN8790@phenom.ffwll.local> <20140516160454.GT27580@intel.com> <23914_1400259040_537641E0_23914_9298_1_20140516165034.GT8790@phenom.ffwll.local> <5387A473.5020102@rus.uni-stuttgart.de> <20140602082705.GJ19050@phenom.ffwll.local> <538C54E0.8090507@rus.uni-stuttgart.de> <20140602152702.GU19050@phenom.ffwll.local> In-Reply-To: <20140602152702.GU19050@phenom.ffwll.local> Cc: intel-gfx Subject: [Intel-gfx] [Patch] Disabling the pipe A quirk for the Fujitsu S6010 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: richter@rus.uni-stuttgart.de List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Daniel, hi others, please find a patch attached that disables the pipe A quirk for the Fujitsu S6010. I will probably add a line for the R31 later, I only need to add the model number. How is the watermark-alignment patch for the 830 doing, btw? Greetings, Thomas From 2006abcd850f8c0995153ffb491efd590103f17f Mon Sep 17 00:00:00 2001 From: thor Date: Mon, 2 Jun 2014 17:32:55 +0200 Subject: [PATCH 2/2] Disabling the pipe A quirk for the Fujitsu S6010. Signed-off-by: thor --- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 54095d4..02b6525 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11535,6 +11535,18 @@ static void quirk_pipea_force(struct drm_device *dev) } /* + * Some 830 based systems do not work with the pipe A quirk + * correctly since they do not use pipe A in first place + */ +static void quirk_disable_pipea_force(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + + dev_priv->quirks &= ~QUIRK_PIPEA_FORCE; + DRM_INFO("removing the pipe a force quirk for this hardware\n"); +} + +/* * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason */ static void quirk_ssc_force_disable(struct drm_device *dev) @@ -11603,6 +11615,9 @@ static struct intel_quirk intel_quirks[] = { /* 830 needs to leave pipe A & dpll A up */ { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, + /* However, do not enable the quirk on S6010 */ + { 0x3577, 0x10cf, 0x113c, quirk_disable_pipea_force }, + /* Lenovo U160 cannot use SSC on LVDS */ { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, -- 1.7.10.4