diff mbox

[linux-next] drm: Add a G200EH PCI id for HPE Proliant Gen9

Message ID 20160721051241.8416-1-standby24x7@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Masanari Iida July 21, 2016, 5:12 a.m. UTC
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 <standby24x7@gmail.com>
Suggested-by: Shane Seymour <seymour.shane@hpe.com>
---
 include/drm/drm_pciids.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Masanari Iida July 21, 2016, 5:21 a.m. UTC | #1
I made mistake to type shane's e-mail address, so I will send version
2.  Sorry for the noise.
Masanari

On Thu, Jul 21, 2016 at 2:12 PM, Masanari Iida <standby24x7@gmail.com> wrote:
> 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 <standby24x7@gmail.com>
> Suggested-by: Shane Seymour <seymour.shane@hpe.com>
> ---
>  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
>
diff mbox

Patch

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}