From patchwork Tue Jul 24 00:11:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hooker X-Patchwork-Id: 1229541 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 75895E0079 for ; Tue, 24 Jul 2012 00:13:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8833F9E9D1 for ; Mon, 23 Jul 2012 17:13:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id BE0D29E787 for ; Mon, 23 Jul 2012 17:12:45 -0700 (PDT) Received: by qabj40 with SMTP id j40so1377915qab.15 for ; Mon, 23 Jul 2012 17:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=od0SeBbpH2xWyxPHlY/s0zGUhj3M1uXAzQQS3lnNsC0=; b=x35lJD33l5u0Wf31S/l51v52oAWgUKRprr1ObOXihFcIXWagPvIdq9B+k/Yd524uSR pdmov0kqcffCIrRn+0s6Q32DRpXoMsal75PezOTltodL8OQ4r/TtDEeHO5wha7vBphoa 2e5T3TecMaLqXG67UGNeOONDDfDdaLwyPlIBrqxsKxuw6+gGp8t0tMz2OoWyqYMWxDjy YIIc+cCG6WvYlVpuoJa3ujLwy3aAEcXgv87Wsyjsm3eF+8DjXNyIpE91aDuak1hbf1S/ zRlv2nakElkylY8ocBDndYbeCibBbiwzdBDXsrBIMhXpjv6dT/4BptY2PRvAW38RZSv9 JwFQ== Received: by 10.224.213.4 with SMTP id gu4mr27431194qab.0.1343088765114; Mon, 23 Jul 2012 17:12:45 -0700 (PDT) Received: from localhost.localdomain (c-68-34-39-96.hsd1.va.comcast.net. [68.34.39.96]) by mx.google.com with ESMTPS id fx5sm11160359qab.14.2012.07.23.17.12.44 (version=SSLv3 cipher=OTHER); Mon, 23 Jul 2012 17:12:44 -0700 (PDT) From: Robert Hooker To: intel-gfx@lists.freedesktop.org Date: Mon, 23 Jul 2012 20:11:46 -0400 Message-Id: <1343088706-15830-1-git-send-email-sarvatt@ubuntu.com> X-Mailer: git-send-email 1.7.9.5 Cc: Robert Hooker Subject: [Intel-gfx] [PATCH] drm/i915: Add support for mobile Haswell SDVs. 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 From: Robert Hooker Mobile variants have a different pci id. Add it, and mark the previous pci id as a desktop variant. Signed-off-by: Robert Hooker --- drivers/char/agp/intel-agp.h | 3 ++- drivers/char/agp/intel-gtt.c | 4 +++- drivers/gpu/drm/i915/i915_drv.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h index 8e2d914..1fcd728 100644 --- a/drivers/char/agp/intel-agp.h +++ b/drivers/char/agp/intel-agp.h @@ -248,7 +248,8 @@ #define PCI_DEVICE_ID_INTEL_HASWELL_S_HB 0x0408 /* Server */ #define PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG 0x040a #define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG 0x041a -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV 0x0c16 /* SDV */ +#define PCI_DEVICE_ID_INTEL_HASWELL_D_SDV 0x0c16 /* Desktop SDV */ +#define PCI_DEVICE_ID_INTEL_HASWELL_M_SDV 0x0c26 /* Mobile SDV */ #define PCI_DEVICE_ID_INTEL_HASWELL_E_HB 0x0c04 int intel_gmch_probe(struct pci_dev *pdev, diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 1237e75..1f756dc 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1501,7 +1501,9 @@ static const struct intel_gtt_driver_description { "Haswell", &sandybridge_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG, "Haswell", &sandybridge_gtt_driver }, - { PCI_DEVICE_ID_INTEL_HASWELL_SDV, + { PCI_DEVICE_ID_INTEL_HASWELL_D_SDV, + "Haswell", &sandybridge_gtt_driver }, + { PCI_DEVICE_ID_INTEL_HASWELL_M_SDV, "Haswell", &sandybridge_gtt_driver }, { 0, NULL, NULL } }; diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9fe9ebe..f4fe01c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -358,6 +358,7 @@ static const struct pci_device_id pciidlist[] = { /* aka */ INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */ INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */ INTEL_VGA_DEVICE(0x0c16, &intel_haswell_d_info), /* SDV */ + INTEL_VGA_DEVICE(0x0c26, &intel_haswell_m_info), /* Mobile SDV */ {0, 0, 0} };