From patchwork Thu Jul 21 05:22:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masanari Iida X-Patchwork-Id: 9240963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C5502607D3 for ; Thu, 21 Jul 2016 05:55:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B53F027CF9 for ; Thu, 21 Jul 2016 05:55:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA29427D64; Thu, 21 Jul 2016 05:55:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 442EB27CF9 for ; Thu, 21 Jul 2016 05:55:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EA176E995; Thu, 21 Jul 2016 05:55:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4B086E98D for ; Thu, 21 Jul 2016 05:22:07 +0000 (UTC) Received: by mail-pf0-x241.google.com with SMTP id h186so4757824pfg.2 for ; Wed, 20 Jul 2016 22:22:07 -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; bh=9G3nrGrRqPnUkIbBKAET2rme6QS3vDIg48CoPmiQDqE=; b=cuRRVN2cd/smBGDWNYAM7XNCWf3PCtpInZFNFVEs1Q4ygHCi/dLAzsZb+EBstl5UQS HoP23RCVH5Gim68tunGGvJAH23MKRoEC78/F7u0F8DKpQYK++NvguVymOPs6srTFpMad RDiUufLm/WraBnnfd9XLsK/i88uwyyprImjIeuuhw4xkqfpf9xqSulpakHru2c2IWBLr m+n6rHExBZO8z5HXoqpfjGZvJTMjUvi+xF9XiSoTLIsacMt/Xq4V8oGKrPBX1B4IzARp EYB/mvfDqGWwyzLTB+dSAWKOo7MTUWpWkFbqAZvSzEfRA4Y2+lDqJGB7yqhV1IAz3rOP Hggg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9G3nrGrRqPnUkIbBKAET2rme6QS3vDIg48CoPmiQDqE=; b=WrYNon1+7GlWNgjTx/UAqMzinpQgjGAw3ipHTGeawrddMDaqtNwa24ZvjU+fzUd0wC NRbIO9VRNIlrBgqUPrJSYGp03cuE027217hhIgHr6Pyb2rM1wK8cbS5nXVWaNb1IB/9I 2uZplYutn9vEpmK3z5z5Hj8LtT+KVdKKMHkJpxJ7diiBSvOQfIWyE3sp/ivTjmAXGg3+ LB65srWWq6JjYPXApCKh0TKkBnF+UkeVFlnn+Z6zi56ng37PbizvaMPgJYJarme9QoyH o1EHSM6e8/CQgIbYeFo3wu3q1MPPtqhrZWPOFjYPXAZt6ukDlj2EOVJva//Ku37Vss31 W8mw== X-Gm-Message-State: ALyK8tIwfH/40nWHJLxwguoVRuom0rLZDnyzXQs+oBI9VlhoMGfFot43rS7bDeUhCTagBA== X-Received: by 10.98.130.137 with SMTP id w131mr70326806pfd.5.1469078526107; Wed, 20 Jul 2016 22:22:06 -0700 (PDT) Received: from masabert (61-205-82-131m5.grp2.mineo.jp. [61.205.82.131]) by smtp.gmail.com with ESMTPSA id zk7sm8369413pac.41.2016.07.20.22.22.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jul 2016 22:22:05 -0700 (PDT) Received: by masabert (Postfix, from userid 1000) id 01A17E52E1; Thu, 21 Jul 2016 14:22:05 +0900 (JST) From: Masanari Iida To: airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, airlied@redhat.com Subject: [PATCH/V2] [linux-next] drm: Add a G200EH PCI id for HPE Proliant Gen9 Date: Thu, 21 Jul 2016 14:22:04 +0900 Message-Id: <20160721052204.8573-1-standby24x7@gmail.com> X-Mailer: git-send-email 2.9.2.368.g08bb350 X-Mailman-Approved-At: Thu, 21 Jul 2016 05:55:05 +0000 Cc: Masanari Iida , shane.seymour@hpe.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Boot the system without this entry generates following warning. fb: conflicting fb hw usage mgag200drmfb vs EFI VGA - removing generic driver After apply this patch, no more conflict message. fb: switching to mgag200drmfb from EFI VGA Compile and tested on DL360 Gen9 and it works both console and X. Signed-off-by: Masanari Iida Suggested-by: Shane Seymour --- include/drm/drm_pciids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h index 8bc073d297db..3e16dfc2e08d 100644 --- a/include/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h @@ -743,6 +743,7 @@ #define mga_PCI_IDS \ {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ + {0x102b, 0x0533, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ {0, 0, 0}