From 646bbdc4b6a7b887ee8f0e51fdff5d07c4586329 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 19 Aug 2008 15:05:00 -0700 Subject: Add quirk for pre-915s with working PFIT regs The regs are undocumented, but on some machines they work fine, so add this quirk to indicate it. --- src/i830.h | 1 + src/i830_lvds.c | 4 ++-- src/i830_quirks.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/i830.h b/src/i830.h index e2b4885e..73fb2ad2 100644 --- a/src/i830.h +++ b/src/i830.h @@ -970,6 +970,7 @@ extern const int I830CopyROP[16]; #define QUIRK_PIPEA_FORCE 0x00000008 #define QUIRK_IVCH_NEED_DVOB 0x00000010 #define QUIRK_RESET_MODES 0x00000020 +#define QUIRK_PFIT_SAFE 0x00000040 extern void i830_fixup_devices(ScrnInfoPtr); #endif /* _I830_H_ */ diff --git a/src/i830_lvds.c b/src/i830_lvds.c index e5feab09..801261a1 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -999,8 +999,8 @@ i830_lvds_create_resources(xf86OutputPtr output) * Panel fitting control */ - /* XXX Disable panel fitting setting on pre-915. */ - if (!IS_I9XX(pI830)) + /* Disable panel fitting setting on untested pre-915 chips */ + if (!IS_I9XX(pI830) && !(pI830->quirk_flag & QUIRK_PFIT_SAFE)) return; panel_fitting_atom = MakeAtom(PANEL_FITTING_NAME, diff --git a/src/i830_quirks.c b/src/i830_quirks.c index a3ed0440..038676e0 100644 --- a/src/i830_quirks.c +++ b/src/i830_quirks.c @@ -161,6 +161,15 @@ static void i830_dmi_dump(void) DMIID_DUMP(chassis_asset_tag); } +/* + * Old chips have undocumented panel fitting registers. Some of them actually + * work; this quirk indicates that. + */ +static void quirk_pfit_safe (I830Ptr pI830) +{ + pI830->quirk_flag |= QUIRK_PFIT_SAFE; +} + /* * Some machines hose the display regs regardless of the ACPI DOS * setting, so we need to reset modes at ACPI event time. @@ -293,6 +302,8 @@ static i830_quirk i830_quirk_list[] = { /* HP Pavilion ze4944ea needs pipe A force quirk (See LP: #242389) */ { PCI_CHIP_I855_GM, 0x103c, 0x3084, quirk_pipea_force }, + { PCI_CHIP_I855_GM, 0x161f, 0x2030, quirk_pfit_safe }, + /* ThinkPad X40 needs pipe A force quirk */ { PCI_CHIP_I855_GM, 0x1014, 0x0557, quirk_pipea_force }, -- cgit v1.2.3 From 1baebabc3af9f21a5b8084788ecd88dc66ce78de Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 19 Aug 2008 16:02:55 -0700 Subject: Add swf_dumper to .gitignore --- src/bios_reader/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bios_reader/.gitignore b/src/bios_reader/.gitignore index 49312f2d..5055aa5a 100644 --- a/src/bios_reader/.gitignore +++ b/src/bios_reader/.gitignore @@ -1,2 +1,3 @@ bios_dumper +swf_dumper bios_reader -- cgit v1.2.3 From 5eccb5ec7ea78b5800f98decd4216d39b9ebe5ec Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 20 Aug 2008 15:33:59 +0800 Subject: Don't skip the checks for DRI headers with --enable-dri --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b24a1541..47f7fe23 100644 --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC -AC_MSG_CHECKING([whether to include DRI support]) -if test x$DRI = xauto; then +if test x$DRI != xno; then AC_CHECK_FILE([${sdkdir}/dri.h], [have_dri_h="yes"], [have_dri_h="no"]) AC_CHECK_FILE([${sdkdir}/sarea.h], @@ -101,7 +100,9 @@ if test x$DRI = xauto; then [have_dristruct_h="yes"], [have_dristruct_h="no"]) AC_CHECK_FILE([${sdkdir}/damage.h], [have_damage_h="yes"], [have_damage_h="no"]) - +fi +AC_MSG_CHECKING([whether to include DRI support]) +if test x$DRI = xauto; then if test "$have_dri_h" = yes -a \ "$have_sarea_h" = yes -a \ "$have_dristruct_h" = yes; then -- cgit v1.2.3