From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751454AbcGUFWK (ORCPT ); Thu, 21 Jul 2016 01:22:10 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33382 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbcGUFWG (ORCPT ); Thu, 21 Jul 2016 01:22:06 -0400 From: Masanari Iida To: airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, airlied@redhat.com Cc: shane.seymour@hpe.com, Masanari Iida 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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} -- 2.9.2.368.g08bb350