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

Commit 0b693eaf authored by Sellout Bessie's avatar Sellout Bessie Committed by Linus Torvalds
Browse files

Radeonfb Xpress 200M RC410 support 



Make radeonfb work ith the 200m Xpress RC410.  In my tests it was terribly
unstable and would freeze until I set a refresh rate in the kernel argument
to 75.

e.g video=radeonfb:1280x800@75

Now it is rock solid.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 80185a9d

drivers/video/aty/ati_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ 
#define PCI_CHIP_MACH64VT		0x5654

#define PCI_CHIP_MACH64VT		0x5654

#define PCI_CHIP_MACH64VU		0x5655

#define PCI_CHIP_MACH64VU		0x5655

#define PCI_CHIP_MACH64VV		0x5656

#define PCI_CHIP_MACH64VV		0x5656

#define PCI_CHIP_RC410_5A62             0x5A62

#define PCI_CHIP_RS300_5834		0x5834

#define PCI_CHIP_RS300_5834		0x5834

#define PCI_CHIP_RS300_5835		0x5835

#define PCI_CHIP_RS300_5835		0x5835

#define PCI_CHIP_RS300_5836		0x5836

#define PCI_CHIP_RS300_5836		0x5836

drivers/video/aty/radeon_base.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -145,6 +145,8 @@ static struct pci_device_id radeonfb_pci_table[] = { 
	/* 9000/Pro */

	/* 9000/Pro */

	CHIP_DEF(PCI_CHIP_RV250_If,	RV250,	CHIP_HAS_CRTC2),

	CHIP_DEF(PCI_CHIP_RV250_If,	RV250,	CHIP_HAS_CRTC2),

	CHIP_DEF(PCI_CHIP_RV250_Ig,	RV250,	CHIP_HAS_CRTC2),

	CHIP_DEF(PCI_CHIP_RV250_Ig,	RV250,	CHIP_HAS_CRTC2),



	CHIP_DEF(PCI_CHIP_RC410_5A62,   RC410,  CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	/* Mobility 9100 IGP (U3) */

	/* Mobility 9100 IGP (U3) */

	CHIP_DEF(PCI_CHIP_RS300_5835,	RS300,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RS300_5835,	RS300,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RS350_7835,	RS300,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),

	CHIP_DEF(PCI_CHIP_RS350_7835,	RS300,	CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
@@ -1999,6 +2001,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) 
        if ((rinfo->family == CHIP_FAMILY_RS100) ||

        if ((rinfo->family == CHIP_FAMILY_RS100) ||

            (rinfo->family == CHIP_FAMILY_RS200) ||

            (rinfo->family == CHIP_FAMILY_RS200) ||

            (rinfo->family == CHIP_FAMILY_RS300) ||

            (rinfo->family == CHIP_FAMILY_RS300) ||

            (rinfo->family == CHIP_FAMILY_RC410) ||

	    (rinfo->family == CHIP_FAMILY_RS480) ) {

	    (rinfo->family == CHIP_FAMILY_RS480) ) {

          u32 tom = INREG(NB_TOM);

          u32 tom = INREG(NB_TOM);

          tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);

          tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);

drivers/video/aty/radeonfb.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ enum radeon_family { 
	CHIP_FAMILY_RV350,

	CHIP_FAMILY_RV350,

	CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */

	CHIP_FAMILY_RV380,    /* RV370/RV380/M22/M24 */

	CHIP_FAMILY_R420,     /* R420/R423/M18 */

	CHIP_FAMILY_R420,     /* R420/R423/M18 */

	CHIP_FAMILY_RC410,

	CHIP_FAMILY_RS480,

	CHIP_FAMILY_RS480,

	CHIP_FAMILY_LAST,

	CHIP_FAMILY_LAST,

};

};
@@ -66,6 +67,7 @@ enum radeon_family { 
				((rinfo)->family == CHIP_FAMILY_R350)  || \

				((rinfo)->family == CHIP_FAMILY_R350)  || \

				((rinfo)->family == CHIP_FAMILY_RV380) || \

				((rinfo)->family == CHIP_FAMILY_RV380) || \

				((rinfo)->family == CHIP_FAMILY_R420)  || \

				((rinfo)->family == CHIP_FAMILY_R420)  || \

                               ((rinfo)->family == CHIP_FAMILY_RC410) || \

                               ((rinfo)->family == CHIP_FAMILY_RS480))

                               ((rinfo)->family == CHIP_FAMILY_RS480))





/*

/*