From patchwork Tue Sep 10 22:36:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 2868171 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 088F7BF43F for ; Tue, 10 Sep 2013 23:15:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3335620357 for ; Tue, 10 Sep 2013 23:15:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5F6F1202B9 for ; Tue, 10 Sep 2013 23:15:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6113CE640F for ; Tue, 10 Sep 2013 16:15:36 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ye0-f177.google.com (mail-ye0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 68D05E76EE for ; Tue, 10 Sep 2013 15:37:27 -0700 (PDT) Received: by mail-ye0-f177.google.com with SMTP id q9so2260024yen.22 for ; Tue, 10 Sep 2013 15:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RoYrz6Bm5evJIvV+vl8CGOzu0st32vX6vjL6u1B+yUY=; b=p+hCNVvDOlsCZonF+IrKhtWxRABQRBJAgtHfDETsD8t1pZMmDp3ukzzgChp2zGeHfX bL7Z8ptO5jDsWRkpdn8HvhOfEkLZufg5+CD0XM4rD9JV5DoYIb5K7yGmSbeflcZavkYK wkzi0JH+WB9h3modQTPVKXpXE8WeKqEgSJhmaQOEZsgTwS/ODtIKpLWlSk5T5YPTz2GE I3yNfVs81WW8m+b2xuvpH/RlAEHU/70hLLRv9vVuJ+qE6l1Cpr3TGDBW6iiJePG5jq9j EUbC1lvlJqz4Z9J5mJhODeeL0dBmTpuJbp7+TT2MuxOVCnEqc/IBzMHvlawPTWWDrUBo SlEA== X-Received: by 10.236.128.45 with SMTP id e33mr23711259yhi.11.1378852647422; Tue, 10 Sep 2013 15:37:27 -0700 (PDT) Received: from localhost.localdomain ([186.204.164.107]) by mx.google.com with ESMTPSA id v22sm27925176yhn.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 10 Sep 2013 15:37:27 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Tue, 10 Sep 2013 19:36:44 -0300 Message-Id: <1378852608-30281-16-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1378852608-30281-1-git-send-email-rodrigo.vivi@gmail.com> References: <1378852608-30281-1-git-send-email-rodrigo.vivi@gmail.com> Cc: stable@vger.kernel.org Subject: [Intel-gfx] [PATCH 15/19] drm/i915: i915.quirks_set/quirks_mask overrides dmi match 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 X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Kamal Mostafa Boot params quirks_set and quirks_mask allow the user to enable or inhibit any dmi-matched quirks, overriding the dmi match table. Examples: i915.quirks_set=0x2 - enables QUIRK_LVDS_SSC_DISABLE i915.quirks_set=0x8 - enables QUIRK_NO_PCH_PWM_ENABLE i915.quirks_mask=0x8 - disables QUIRK_NO_PCH_PWM_ENABLE i915.quirks_mask=0xFF - disables all quirks Signed-off-by: Kamal Mostafa Cc: stable@vger.kernel.org Signed-off-by: Rodrigo Vivi --- 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 1eabca3..12607f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10043,8 +10043,19 @@ static struct intel_quirk intel_quirks[] = { { 0x0166, 0x1028, 0x058b, quirk_no_pcm_pwm_enable }, }; +unsigned long i915_quirks_set __read_mostly = 0; +module_param_named(quirks_set, i915_quirks_set, ulong, 0600); +MODULE_PARM_DESC(quirks_set, + "Enable specified quirks bits."); + +unsigned long i915_quirks_mask __read_mostly = 0; +module_param_named(quirks_mask, i915_quirks_mask, ulong, 0600); +MODULE_PARM_DESC(quirks_mask, + "Disable specified quirks bits (override dmi match)."); + static void intel_init_quirks(struct drm_device *dev) { + struct drm_i915_private *dev_priv = dev->dev_private; struct pci_dev *d = dev->pdev; int i; @@ -10062,6 +10073,10 @@ static void intel_init_quirks(struct drm_device *dev) if (dmi_check_system(*intel_dmi_quirks[i].dmi_id_list) != 0) intel_dmi_quirks[i].hook(dev); } + + /* handle user-specified quirks overrides */ + dev_priv->quirks |= i915_quirks_set; + dev_priv->quirks &= ~i915_quirks_mask; } /* Disable the VGA plane that we never use */