Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106c4a9c authored by aherrman@arcor.de's avatar aherrman@arcor.de Committed by Linus Torvalds
Browse files

radeonfb: fix chip definition for Radeon Xpress 200M 0x5975 



This fixes a problem introduced with commit
b5f2f4d1
The commit added a wrong chip definition to radeonfb which causes
a blank console on my Laptop if radeonfb is loaded.

The patch
 - renames PCI_CHIP_RS485_5975 to PCI_CHIP_RS482_5975
 - corrects the chip family (RS480 instead of R300) for 0x5975
 - ensures that PCI IDs are in ascending order in ati_ids.h

Signed-off-by: default avatarAndreas Herrmann <aherrman@arcor.de>
Tentatively-acked-by: default avatarBen Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2740e45

drivers/video/aty/ati_ids.h

+6 −6
Original line number Diff line number Diff line
@@ -192,6 +192,12 @@ 
#define PCI_CHIP_RS300_5835		0x5835

#define PCI_CHIP_RS300_5836		0x5836

#define PCI_CHIP_RS300_5837		0x5837

#define PCI_CHIP_RS480_5955             0x5955

#define PCI_CHIP_RV280_5960		0x5960

#define PCI_CHIP_RV280_5961		0x5961

#define PCI_CHIP_RV280_5962		0x5962

#define PCI_CHIP_RV280_5964		0x5964

#define PCI_CHIP_RS482_5975		0x5975

#define PCI_CHIP_RV370_5B60             0x5B60

#define PCI_CHIP_RV370_5B61             0x5B61

#define PCI_CHIP_RV370_5B62             0x5B62
@@ -200,14 +206,8 @@ 
#define PCI_CHIP_RV370_5B65             0x5B65

#define PCI_CHIP_RV370_5B66             0x5B66

#define PCI_CHIP_RV370_5B67             0x5B67

#define PCI_CHIP_RV280_5960		0x5960

#define PCI_CHIP_RV280_5961		0x5961

#define PCI_CHIP_RV280_5962		0x5962

#define PCI_CHIP_RV280_5964		0x5964

#define PCI_CHIP_RS485_5975		0x5975

#define PCI_CHIP_RV280_5C61		0x5C61

#define PCI_CHIP_RV280_5C63		0x5C63

#define PCI_CHIP_R423_5D57              0x5D57

#define PCI_CHIP_RS350_7834             0x7834

#define PCI_CHIP_RS350_7835             0x7835
 
#define PCI_CHIP_RS480_5955             0x5955

drivers/video/aty/radeon_base.c

+1 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
static struct pci_device_id radeonfb_pci_table[] = {

        /* Radeon Xpress 200m */

	CHIP_DEF(PCI_CHIP_RS480_5955,   RS480,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RS482_5975,	RS480,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	/* Mobility M6 */

	CHIP_DEF(PCI_CHIP_RADEON_LY, 	RV100,	CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RADEON_LZ,	RV100,	CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
@@ -153,8 +154,6 @@ static struct pci_device_id radeonfb_pci_table[] = { 
	/* Mobility 9200 (M9+) */

	CHIP_DEF(PCI_CHIP_RV280_5C61,	RV280,	CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RV280_5C63,	RV280,	CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),

	/*Mobility Xpress 200 */

	CHIP_DEF(PCI_CHIP_RS485_5975,	R300,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	/* 9200 */

	CHIP_DEF(PCI_CHIP_RV280_5960,	RV280,	CHIP_HAS_CRTC2),

	CHIP_DEF(PCI_CHIP_RV280_5961,	RV280,	CHIP_HAS_CRTC2),