aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2011-02-25 18:07:12 +0000
committerMartin Wilke <miwi@FreeBSD.org>2011-02-25 18:07:12 +0000
commit0c857af46b533d13cfeff2909e38aa5b2e8e9e3f (patch)
tree55d3b0cc2f30e7d6d7f0a6b04389984a22cfe53a /x11-drivers
parente3a5931c50837d201721605e80b5fa6d838eea86 (diff)
downloadports-0c857af46b533d13cfeff2909e38aa5b2e8e9e3f.tar.gz
ports-0c857af46b533d13cfeff2909e38aa5b2e8e9e3f.zip
Notes
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c35
-rw-r--r--x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c12
-rw-r--r--x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c20
3 files changed, 67 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c b/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
new file mode 100644
index 000000000000..bb4d826be806
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
@@ -0,0 +1,35 @@
+--- src/atombios_output.c.orig 2011-01-27 10:05:58.000000000 -0700
++++ src/atombios_output.c 2011-02-05 12:20:30.000000000 -0700
+@@ -172,7 +172,6 @@
+ #define DP_SET_POWER_D3 0x2
+
+ static void do_displayport_link_train(xf86OutputPtr output);
+-static void atombios_pick_dig_encoder(xf86OutputPtr output);
+
+ static int
+ atombios_output_dac_setup(xf86OutputPtr output, int action)
+@@ -1469,7 +1468,6 @@
+
+ if (radeon_encoder == NULL)
+ return;
+- atombios_pick_dig_encoder(output);
+
+ switch (radeon_encoder->encoder_id) {
+ case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+@@ -1781,7 +1779,7 @@
+ }
+ }
+
+-static void
++void
+ atombios_pick_dig_encoder(xf86OutputPtr output)
+ {
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(output->scrn);
+@@ -1878,7 +1876,6 @@
+ return;
+
+ radeon_output->pixel_clock = adjusted_mode->Clock;
+- atombios_pick_dig_encoder(output);
+ atombios_output_overscan_setup(output, mode, adjusted_mode);
+ atombios_output_scaler_setup(output);
+ atombios_set_output_crtc_source(output);
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c b/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c
new file mode 100644
index 000000000000..2b47c53b70fb
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c
@@ -0,0 +1,12 @@
+--- src/radeon_driver.c.orig 2010-12-03 20:34:44.419175412 +1000
++++ src/radeon_driver.c 2010-12-03 20:37:22.896179333 +1000
+@@ -1454,6 +1454,9 @@
+ * internal memory map.
+ * See fdo bug 24301.
+ */
++ if (mem_size > aper_size)
++ mem_size = aper_size;
++
+ if (mem_size > 0x20000000)
+ mem_size = aper_size;
+
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c b/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
new file mode 100644
index 000000000000..18a0713a04bd
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
@@ -0,0 +1,20 @@
+--- src/radeon_output.c.orig 2011-02-01 17:01:22.000000000 -0700
++++ src/radeon_output.c 2011-02-05 12:22:53.000000000 -0700
+@@ -120,6 +120,8 @@
+ radeon_bios_output_crtc(xf86OutputPtr output);
+ static void
+ radeon_bios_output_lock(xf86OutputPtr output, Bool lock);
++extern void
++atombios_pick_dig_encoder(xf86OutputPtr output);
+
+ void RADEONPrintPortMap(ScrnInfoPtr pScrn)
+ {
+@@ -731,6 +733,8 @@
+ }
+
+ radeon_bios_output_lock(output, TRUE);
++ if (IS_AVIVO_VARIANT)
++ atombios_pick_dig_encoder(output);
+ radeon_dpms(output, DPMSModeOff);
+ radeon_crtc_dpms(output->crtc, DPMSModeOff);
+