Attachment #33769 for bug #54684





	/* Set PPLL ref. div */
	if (rinfo->family == CHIP_FAMILY_R300 ||
	    rinfo->family == CHIP_FAMILY_RS300 ||
	    rinfo->family == CHIP_FAMILY_R350 ||
	    rinfo->family == CHIP_FAMILY_RV350) {
		if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {

	     rinfo->family == CHIP_FAMILY_RV280 ||
	     rinfo->family == CHIP_FAMILY_RV350) &&
	    !machine_is_compatible("PowerBook4,3") &&
	    !machine_is_compatible("PowerBook6,3") &&
	    !machine_is_compatible("PowerBook6,5"))
		conv_table = backlight_conv_m7;
	else
		conv_table = backlight_conv_m6;

#endif /* CONFIG_PPC_OF */

	/* framebuffer size */
        if ((rinfo->family == CHIP_FAMILY_RS100) ||
            (rinfo->family == CHIP_FAMILY_RS200) ||
            (rinfo->family == CHIP_FAMILY_RS300)) {
          u32 tom = INREG(NB_TOM);
          tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
 
          OUTREG(MC_FB_LOCATION, tom);
          OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
          OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
          OUTREG(OV0_BASE_ADDR, (tom & 0xffff) << 16);
 
          /* This is supposed to fix the crtc2 noise problem. */
          OUTREG(GRPH2_BUFFER_CNTL, INREG(GRPH2_BUFFER_CNTL) & ~0x7f0000);
 
          if ((rinfo->family == CHIP_FAMILY_RS100) ||
              (rinfo->family == CHIP_FAMILY_RS200)) {
             /* This is to workaround the asic bug for RMX, some versions
                of BIOS dosen't have this register initialized correctly.
             */
             OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN,
                     ~CRTC_H_CUTOFF_ACTIVE_EN);
          }
        } else {
          tmp = INREG(CONFIG_MEMSIZE);
        }

	/* mem size is bits [28:0], mask off the rest */
	rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;

Lines 173-178 Link Here

(-)linux/include/video/radeon.h.orig (-1 / +4 lines)
173	#define CUR_CLR1 0x0270	173	#define CUR_CLR1 0x0270
174	#define FP_HORZ_VERT_ACTIVE 0x0278	174	#define FP_HORZ_VERT_ACTIVE 0x0278
175	#define CRTC_MORE_CNTL 0x027C	175	#define CRTC_MORE_CNTL 0x027C
		176	#define CRTC_H_CUTOFF_ACTIVE_EN (1<<4)
		177	#define CRTC_V_CUTOFF_ACTIVE_EN (1<<5)
176	#define DAC_EXT_CNTL 0x0280	178	#define DAC_EXT_CNTL 0x0280
177	#define FP_GEN_CNTL 0x0284	179	#define FP_GEN_CNTL 0x0284
178	#define FP_HORZ_STRETCH 0x028C	180	#define FP_HORZ_STRETCH 0x028C
Lines 185-190 Link Here
185	//#define DDA_ON_OFF 0x02e4	187	//#define DDA_ON_OFF 0x02e4
186	#define DVI_I2C_CNTL_1 0x02e4	188	#define DVI_I2C_CNTL_1 0x02e4
187	#define GRPH_BUFFER_CNTL 0x02F0	189	#define GRPH_BUFFER_CNTL 0x02F0
		190	#define GRPH2_BUFFER_CNTL 0x03F0
188	#define VGA_BUFFER_CNTL 0x02F4	191	#define VGA_BUFFER_CNTL 0x02F4
189	#define OV0_Y_X_START 0x0400	192	#define OV0_Y_X_START 0x0400
190	#define OV0_Y_X_END 0x0404	193	#define OV0_Y_X_END 0x0404
Lines 1944-1950 Link Here
1944	#define ixREG_COLLAR_WRITE 0x0013	1947	#define ixREG_COLLAR_WRITE 0x0013
1945	#define ixREG_COLLAR_READ 0x0014	1948	#define ixREG_COLLAR_READ 0x0014
1946		1949
1947		1950	#define NB_TOM 0x15C
1948		1951
1949		1952
1950	#endif /* _RADEON_H */	1953	#endif /* _RADEON_H */

Lines 653-659 Link Here

(-)linux/drivers/video/aty/radeon_monitor.c.orig (-1 / +2 lines)
653	rinfo->panel_info.use_bios_dividers = 1;	653	rinfo->panel_info.use_bios_dividers = 1;
654	}	654	}
655	/* iBook G4 */	655	/* iBook G4 */
656	if (machine_is_compatible("PowerBook6,3")) {	656	if (machine_is_compatible("PowerBook6,3") \|
		657	machine_is_compatible("PowerBook6,5")) {
657	rinfo->panel_info.ref_divider = rinfo->pll.ref_div;	658	rinfo->panel_info.ref_divider = rinfo->pll.ref_div;
658	rinfo->panel_info.post_divider = 0x6;	659	rinfo->panel_info.post_divider = 0x6;
659	rinfo->panel_info.fbk_divider = 0xad;	660	rinfo->panel_info.fbk_divider = 0xad;

Return to bug 54684

Lines 1144-1149 Link Here

(-)linux/drivers/video/aty/radeon_base.c.orig (-2 / +28 lines)
1144		1144
1145	/* Set PPLL ref. div */	1145	/* Set PPLL ref. div */
1146	if (rinfo->family == CHIP_FAMILY_R300 \|\|	1146	if (rinfo->family == CHIP_FAMILY_R300 \|\|
		1147	rinfo->family == CHIP_FAMILY_RS300 \|\|
1147	rinfo->family == CHIP_FAMILY_R350 \|\|	1148	rinfo->family == CHIP_FAMILY_R350 \|\|
1148	rinfo->family == CHIP_FAMILY_RV350) {	1149	rinfo->family == CHIP_FAMILY_RV350) {
1149	if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {	1150	if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) {
Lines 1855-1861 Link Here
1855	rinfo->family == CHIP_FAMILY_RV280 \|\|	1856	rinfo->family == CHIP_FAMILY_RV280 \|\|
1856	rinfo->family == CHIP_FAMILY_RV350) &&	1857	rinfo->family == CHIP_FAMILY_RV350) &&
1857	!machine_is_compatible("PowerBook4,3") &&	1858	!machine_is_compatible("PowerBook4,3") &&
1858	!machine_is_compatible("PowerBook6,3"))	1859	!machine_is_compatible("PowerBook6,3") &&
		1860	!machine_is_compatible("PowerBook6,5"))
1859	conv_table = backlight_conv_m7;	1861	conv_table = backlight_conv_m7;
1860	else	1862	else
1861	conv_table = backlight_conv_m6;	1863	conv_table = backlight_conv_m6;
Lines 2129-2135 Link Here
2129	#endif /* CONFIG_PPC_OF */	2131	#endif /* CONFIG_PPC_OF */
2130		2132
2131	/* framebuffer size */	2133	/* framebuffer size */
2132	tmp = INREG(CONFIG_MEMSIZE);	2134	if ((rinfo->family == CHIP_FAMILY_RS100) \|\|
		2135	(rinfo->family == CHIP_FAMILY_RS200) \|\|
		2136	(rinfo->family == CHIP_FAMILY_RS300)) {
		2137	u32 tom = INREG(NB_TOM);
		2138	tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);
		2139
		2140	OUTREG(MC_FB_LOCATION, tom);
		2141	OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
		2142	OUTREG(CRTC2_DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
		2143	OUTREG(OV0_BASE_ADDR, (tom & 0xffff) << 16);
		2144
		2145	/* This is supposed to fix the crtc2 noise problem. */
		2146	OUTREG(GRPH2_BUFFER_CNTL, INREG(GRPH2_BUFFER_CNTL) & ~0x7f0000);
		2147
		2148	if ((rinfo->family == CHIP_FAMILY_RS100) \|\|
		2149	(rinfo->family == CHIP_FAMILY_RS200)) {
		2150	/* This is to workaround the asic bug for RMX, some versions
		2151	of BIOS dosen't have this register initialized correctly.
		2152	*/
		2153	OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN,
		2154	~CRTC_H_CUTOFF_ACTIVE_EN);
		2155	}
		2156	} else {
		2157	tmp = INREG(CONFIG_MEMSIZE);
		2158	}
2133		2159
2134	/* mem size is bits [28:0], mask off the rest */	2160	/* mem size is bits [28:0], mask off the rest */
2135	rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;	2161	rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;