Attachment #7899 for bug #3022

View | Details | Raw Unified | Return to bug 3022 | Differences between

and this patch

Lines 272-278 static int force_measure_pll = 0; Link Here

(-)linux-2.6.16/drivers/video/aty/radeon_base.c (-1 / +16 lines)
272	#ifdef CONFIG_MTRR	272	#ifdef CONFIG_MTRR
273	static int nomtrr = 0;	273	static int nomtrr = 0;
274	#endif	274	#endif
275		275	#if defined(CONFIG_PM) && defined(CONFIG_X86)
		276	int force_sleep = 0;
		277	int nosleep = 0;
		278	#endif
276	/*	279	/*
277	* prototypes	280	* prototypes
278	*/	281	*/
Lines 2615-2620 static int __init radeonfb_setup (char * Link Here
2615	force_measure_pll = 1;	2618	force_measure_pll = 1;
2616	} else if (!strncmp(this_opt, "ignore_edid", 11)) {	2619	} else if (!strncmp(this_opt, "ignore_edid", 11)) {
2617	ignore_edid = 1;	2620	ignore_edid = 1;
		2621	#if defined(CONFIG_PM) && defined(CONFIG_X86)
		2622	} else if (!strncmp(this_opt, "force_sleep", 11)) {
		2623	force_sleep = 1;
		2624	} else if (!strncmp(this_opt, "nosleep", 7)) {
		2625	nosleep = 1;
		2626	#endif
2618	} else	2627	} else
2619	mode_option = this_opt;	2628	mode_option = this_opt;
2620	}	2629	}
Lines 2670-2672 module_param(panel_yres, int, 0); Link Here
2670	MODULE_PARM_DESC(panel_yres, "int: set panel yres");	2679	MODULE_PARM_DESC(panel_yres, "int: set panel yres");
2671	module_param(mode_option, charp, 0);	2680	module_param(mode_option, charp, 0);
2672	MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");	2681	MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
		2682	#if defined(CONFIG_PM) && defined(CONFIG_X86)
		2683	module_param(force_sleep, bool, 0);
		2684	MODULE_PARM_DESC(force_sleep, "bool: force D2 sleep mode on non whitelisted laptops");
		2685	module_param(nosleep, bool, 0);
		2686	MODULE_PARM_DESC(nosleep, "bool: disable D2 sleep mode, ignoring whitelisted laptops");
		2687	#endif





#include "ati_ids.h"

#if defined(CONFIG_PM) && defined(CONFIG_X86)
/* DMI is used to detect PC laptops known to support D2 sleep */
#include <linux/dmi.h>

/* Whitelist of PC laptops known to support D2 sleep */
static int radeon_sleep_dmi_whitelisted(struct dmi_system_id *id) {
	printk(KERN_DEBUG "radeonfb: %s detected, enabling D2 sleep\n", id->ident);
	return 1;
}
#define RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL(model) { \
	.ident = "IBM ThinkPad " model, \
	.callback = radeon_sleep_dmi_whitelisted, \
	.matches = { \
		DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad " model) \
	} \
}
#define RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE(type,name) { \
	.ident = "IBM ThinkPad " name " (" type ")", \
	.callback = radeon_sleep_dmi_whitelisted, \
	.matches = { \
		DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		DMI_MATCH(DMI_PRODUCT_NAME, type) \
	} \
}
static struct dmi_system_id radeon_sleep_dmi_whitelist[] = {
	// This models all had at least one positive report and no negative one
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R50"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R51"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T40p"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T41p"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T41"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T42"),
	// Same for this ones, but it's still to confirm that the DMI string exists
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T30"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R32"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("X31"),
	// R40 does not have the version DMI string
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2681","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2682","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2683","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2722","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2723","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2724","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2892","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2893","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2896","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2897","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2898","R40"),
	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2899","R40"),
	{ .ident = NULL }
};

/* Need a blacklist too because DMI matching is done by substrings search */
#define RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL(model) { \
	.ident = "IBM ThinkPad " model, \
	.matches = { \
		DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad " model) \
	} \
}
#define RADEON_SLEEP_THINKPAD_DMI_UNMATCH_TYPE(type,name) { \
	.ident = "IBM ThinkPad " name " (" type ")", \
	.matches = { \
		DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		DMI_MATCH(DMI_PRODUCT_NAME, type) \
	} \
}
static struct dmi_system_id radeon_sleep_dmi_blacklist[] = {
	// Excluded by lack of positive report, and possibly wrong substring match
	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R50p"),
	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R50e"),
	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R51e"),
	// T42p excluded because of one negative report and no positive one
	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("T42p"),
	{ .ident = NULL }
};

/* Macro for checking DMI infos against the whitelist */
#define radeon_sleep_match_whitelist() \
	(! dmi_check_system(radeon_sleep_dmi_blacklist) \
	 && dmi_check_system(radeon_sleep_dmi_whitelist))

/* Module parameters to ignore the whitelist */
extern int force_sleep;
extern int nosleep;
#endif /* defined(CONFIG_PM) && defined(CONFIG_X86) */

static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
{
	u32 tmp;

	/* because both INPLL and OUTPLL take the same lock, that's why. */
	tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
	OUTPLL( pllMCLK_MISC, tmp);

	/* BUS_CNTL1__MOBILE_PLATORM_SEL setting is northbridge chipset
	 * and radeon chip dependent. Thus we only enable it on Mac for
	 * now (until we get more info on how to compute the correct
	 * value for various X86 bridges).
	 */
#ifdef CONFIG_PPC_PMAC
	if (machine_is(powermac)) {	
	/* AGP PLL control */
	        if (rinfo->family <= CHIP_FAMILY_RV280) {
		       OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);

		       OUTREG(BUS_CNTL1,
		       (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
		       | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));	// 440BX
	        } else {
		       OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
		       OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
	}
}
#endif
	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
	

#endif
	}
#endif /* defined(CONFIG_PPC_PMAC) */

/* The PM code also works on some PC laptops.
 * We can do D2 on at least M7 and M9 on some IBM ThinkPad models.
 */
#if defined(CONFIG_X86)
	if (!nosleep && (force_sleep || radeon_sleep_match_whitelist())) {
		if (force_sleep)
			printk(KERN_DEBUG "radeonfb: forcefully enabling D2 sleep mode\n");

		if (rinfo->is_mobility && rinfo->pm_reg &&
		    rinfo->family <= CHIP_FAMILY_RV250)
			rinfo->pm_mode |= radeon_pm_d2;
	}
#endif /* defined(CONFIG_X86) */
#endif /* defined(CONFIG_PM) */
}


Return to bug 3022

Lines 27-32 Link Here

(-)linux-2.6.16/drivers/video/aty/radeon_pm.c (-8 / +119 lines)
27		27
28	#include "ati_ids.h"	28	#include "ati_ids.h"
29		29
		30	#if defined(CONFIG_PM) && defined(CONFIG_X86)
		31	/* DMI is used to detect PC laptops known to support D2 sleep */
		32	#include <linux/dmi.h>
		33
		34	/* Whitelist of PC laptops known to support D2 sleep */
		35	static int radeon_sleep_dmi_whitelisted(struct dmi_system_id *id) {
		36	printk(KERN_DEBUG "radeonfb: %s detected, enabling D2 sleep\n", id->ident);
		37	return 1;
		38	}
		39	#define RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL(model) { \
		40	.ident = "IBM ThinkPad " model, \
		41	.callback = radeon_sleep_dmi_whitelisted, \
		42	.matches = { \
		43	DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		44	DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad " model) \
		45	} \
		46	}
		47	#define RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE(type,name) { \
		48	.ident = "IBM ThinkPad " name " (" type ")", \
		49	.callback = radeon_sleep_dmi_whitelisted, \
		50	.matches = { \
		51	DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		52	DMI_MATCH(DMI_PRODUCT_NAME, type) \
		53	} \
		54	}
		55	static struct dmi_system_id radeon_sleep_dmi_whitelist[] = {
		56	// This models all had at least one positive report and no negative one
		57	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R50"),
		58	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R51"),
		59	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T40p"),
		60	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T40"),
		61	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T41p"),
		62	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T41"),
		63	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T42"),
		64	// Same for this ones, but it's still to confirm that the DMI string exists
		65	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("T30"),
		66	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("R32"),
		67	RADEON_SLEEP_THINKPAD_DMI_MATCH_MODEL("X31"),
		68	// R40 does not have the version DMI string
		69	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2681","R40"),
		70	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2682","R40"),
		71	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2683","R40"),
		72	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2722","R40"),
		73	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2723","R40"),
		74	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2724","R40"),
		75	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2892","R40"),
		76	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2893","R40"),
		77	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2896","R40"),
		78	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2897","R40"),
		79	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2898","R40"),
		80	RADEON_SLEEP_THINKPAD_DMI_MATCH_TYPE("2899","R40"),
		81	{ .ident = NULL }
		82	};
		83
		84	/* Need a blacklist too because DMI matching is done by substrings search */
		85	#define RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL(model) { \
		86	.ident = "IBM ThinkPad " model, \
		87	.matches = { \
		88	DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
		89	DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad " model) \
		90	} \
		91	}
		92	#define RADEON_SLEEP_THINKPAD_DMI_UNMATCH_TYPE(type,name) { \
		93	.ident = "IBM ThinkPad " name " (" type ")", \
94	.matches = { \
95	DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), \
96	DMI_MATCH(DMI_PRODUCT_NAME, type) \
97	} \
98	}
99	static struct dmi_system_id radeon_sleep_dmi_blacklist[] = {
100	// Excluded by lack of positive report, and possibly wrong substring match
101	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R50p"),
102	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R50e"),
103	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("R51e"),
104	// T42p excluded because of one negative report and no positive one
105	RADEON_SLEEP_THINKPAD_DMI_UNMATCH_MODEL("T42p"),
106	{ .ident = NULL }
107	};
108
109	/* Macro for checking DMI infos against the whitelist */
110	#define radeon_sleep_match_whitelist() \
111	(! dmi_check_system(radeon_sleep_dmi_blacklist) \
112	&& dmi_check_system(radeon_sleep_dmi_whitelist))
113
114	/* Module parameters to ignore the whitelist */
115	extern int force_sleep;
116	extern int nosleep;
117	#endif /* defined(CONFIG_PM) && defined(CONFIG_X86) */
118
30	static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)	119	static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
31	{	120	{
32	u32 tmp;	121	u32 tmp;
Lines 852-870 static void radeon_pm_setup_for_suspend( Link Here
852	/* because both INPLL and OUTPLL take the same lock, that's why. */	941	/* because both INPLL and OUTPLL take the same lock, that's why. */
853	tmp = INPLL( pllMCLK_MISC) \| MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;	942	tmp = INPLL( pllMCLK_MISC) \| MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
854	OUTPLL( pllMCLK_MISC, tmp);	943	OUTPLL( pllMCLK_MISC, tmp);
855		944
		945	/* BUS_CNTL1__MOBILE_PLATORM_SEL setting is northbridge chipset
		946	* and radeon chip dependent. Thus we only enable it on Mac for
		947	* now (until we get more info on how to compute the correct
		948	* value for various X86 bridges).
		949	*/
		950	#ifdef CONFIG_PPC_PMAC
		951	if (machine_is(powermac)) {
856	/* AGP PLL control */	952	/* AGP PLL control */
857	if (rinfo->family <= CHIP_FAMILY_RV280) {	953	if (rinfo->family <= CHIP_FAMILY_RV280) {
858	OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) \| BUS_CNTL1__AGPCLK_VALID);	954	OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) \| BUS_CNTL1__AGPCLK_VALID);
859		955
860	OUTREG(BUS_CNTL1,	956	OUTREG(BUS_CNTL1,
861	(INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)	957	(INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
862	\| (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT)); // 440BX	958	\| (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT)); // 440BX
863	} else {	959	} else {
864	OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));	960	OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
865	OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) \| 0x8000);	961	OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) \| 0x8000);
866	}	962	}
867		963	}
		964	#endif
868	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)	965	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
869	& ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));	966	& ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
870		967
Lines 2789-2794 void radeonfb_pm_init(struct radeonfb_in Link Here
2789	#endif	2886	#endif
2790	}	2887	}
2791	#endif /* defined(CONFIG_PPC_PMAC) */	2888	#endif /* defined(CONFIG_PPC_PMAC) */
		2889
		2890	/* The PM code also works on some PC laptops.
		2891	* We can do D2 on at least M7 and M9 on some IBM ThinkPad models.
		2892	*/
		2893	#if defined(CONFIG_X86)
		2894	if (!nosleep && (force_sleep \|\| radeon_sleep_match_whitelist())) {
		2895	if (force_sleep)
		2896	printk(KERN_DEBUG "radeonfb: forcefully enabling D2 sleep mode\n");
		2897
		2898	if (rinfo->is_mobility && rinfo->pm_reg &&
		2899	rinfo->family <= CHIP_FAMILY_RV250)
		2900	rinfo->pm_mode \|= radeon_pm_d2;
		2901	}
		2902	#endif /* defined(CONFIG_X86) */
2792	#endif /* defined(CONFIG_PM) */	2903	#endif /* defined(CONFIG_PM) */
2793	}	2904	}
2794		2905