Attachment 131045 Details for Bug 263199

[patch] Updated sax2 patch

sax-radeon-monitorlayout-2.diff (text/plain), 6.20 KB, created by Matthias Hopf on 2007-04-13 15:03:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2007-04-13 15:03:21 UTC

Size: 6.20 KB

patch

obsolete

>diff -urp profile.orig/Profile.pm profile/Profile.pm
>--- profile.orig/Profile.pm	2007-04-07 08:58:12.000000000 +0200
>+++ profile/Profile.pm	2007-04-13 16:59:35.000000000 +0200
>@@ -226,6 +226,58 @@ sub ProfileIntelSetupMonitorLayout {
> }
> 
> #=====================================
>+# ProfileRadeonGetMonitorLayout
>+#-------------------------------------
>+sub ProfileRadeonGetMonitorLayout {
>+	my $xorglog  = ProfileReadXLogFile();
>+	my %devs = ();
>+	my $secondary = "AUTO";
>+	$_ = $xorglog;
>+	while (/^$..$ RADEON$\d+$: Port(\d):\n Monitor\s.*\n Connector\s*--\s*(\S+)\s*$/mg) {
>+		my $p=$1;
>+		my $c=$2;
>+		$devs{$p}=$c;
>+	}
>+	if (! defined $devs{2}) {
>+		if (! defined $devs{1}) {
>+			print STDERR "*** No output configuration found\n";
>+		} else {
>+			print STDERR "*** No secondary output found\n";
>+		}
>+	} elsif ($devs{2} eq "VGA" || $devs{2} eq "DVI-A") {
>+		$secondary = "CRT";
>+	} elsif ($devs{1} eq "LVDS" && $devs{2} eq "DVI-I") {
>+		$secondary = "CRT";
>+	} elsif ($devs{2} eq "DVI-D") {
>+		$secondary = "TMDS";
>+	} else {
>+		print STDERR "*** Nontrivial output configuration $devs{1},$devs{2} found\n";
>+	}
>+	print STDERR "*** Selecting AUTOCRT,$secondary as monitor configuration.\n";
>+	return "AUTOCRT,$secondary";
>+}
>+
>+#=====================================
>+# ProfileRadeonSetupMonitorLayout
>+#-------------------------------------
>+sub ProfileRadeonSetupMonitorLayout {
>+	my $profile = $_[0];
>+	my $stdname = ProfileName();
>+	local $/;
>+	open (FD,"<",$profile) ||
>+		die "*** $stdname: Can't open $profile: $!";
>+	my $profileData = <FD>;
>+	my $monitorLayout = ProfileRadeonGetMonitorLayout();
>+	$profileData =~ s/\[MONITORLAYOUT\]/$monitorLayout/;
>+	close FD;
>+	open (FD,">",$profile) ||
>+		die "*** $stdname: Can't open $profile: $!";
>+	print FD $profileData;
>+	close FD;
>+	return $monitorLayout;
>+}
>+
>+#=====================================
> # ProfileNVidiaGetMonitorLayout
> #-------------------------------------
> sub ProfileNVidiaGetMonitorLayout {
>diff -urp profile.orig/Radeon_DualHead.pl profile/Radeon_DualHead.pl
>--- profile.orig/Radeon_DualHead.pl	2007-04-07 08:58:13.000000000 +0200
>+++ profile/Radeon_DualHead.pl	2007-04-12 20:10:58.000000000 +0200
>@@ -21,8 +21,12 @@ my $profile = ProfileInitScript();
> #====================================
> # Do the profile adaptions...
> #------------------------------------
>+my $mlayout = ProfileRadeonSetupMonitorLayout ($profile);
>+
> open (FD,">>",$profile) ||
> 	die "Radeon_DualHead: Can't open $profile: $!";
>+print FD "Device->[X]->Raw->20->Option=\"MonitorLayout\" \"$mlayout\"\n";
>+print FD "Device->[X+1]->Raw->20->Option=\"MonitorLayout\" \"$mlayout\"\n";
> #====================================
> # check secondary DDC data
> #------------------------------------
>diff -urp profile.orig/Radeon_DualHead_DriverOptions profile/Radeon_DualHead_DriverOptions
>--- profile.orig/Radeon_DualHead_DriverOptions	2007-04-07 08:58:12.000000000 +0200
>+++ profile/Radeon_DualHead_DriverOptions	2007-04-12 19:27:05.000000000 +0200
>@@ -12,16 +12,17 @@ $Model  = Monitor -> [X] -> ModelName
> 
> Device  -> [X] -> Option = SaXDualHead
> 
>-Device  -> [X] -> Raw -> 20 -> Option = "MergedFB" "yes"
>-Device  -> [X] -> Raw -> 21 -> Option = "IgnoreEDID" "yes"
>-Device  -> [X] -> Raw -> 22 -> Option = "CRT2Position" "Clone"
>-Device  -> [X] -> Raw -> 23 -> Option = "SaXDualOrientation" "LeftOf"
>-Device  -> [X] -> Raw -> 24 -> Option = "SaXDualMode" "Clone"
>-Device  -> [X] -> Raw -> 25 -> Option = "SaXDualMonitorVendor" "${Vendor}"
>-Device  -> [X] -> Raw -> 26 -> Option = "SaXDualMonitorModel" "${Model}"
>-Device  -> [X] -> Raw -> 28 -> Option = "CRT2HSync" "${Hsync}"
>-Device  -> [X] -> Raw -> 29 -> Option = "CRT2VRefresh" "${Vsync}"
>-Device  -> [X] -> Raw -> 30 -> Option = "MetaModes" "${Modes[0]},${Modes[0]}"
>-Device  -> [X] -> Raw -> 31 -> Option = "SaXDualHSync" "${Hsync}"
>-Device  -> [X] -> Raw -> 32 -> Option = "SaXDualVSync" "${Vsync}"
>-Device  -> [X] -> Raw -> 33 -> Option = "SaXDualResolution" "${Modes[0]}"
>+Device  -> [X] -> Raw -> 20 -> Option = "MonitorLayout" "[MONITORLAYOUT]"
>+Device  -> [X] -> Raw -> 21 -> Option = "MergedFB" "yes"
>+Device  -> [X] -> Raw -> 22 -> Option = "IgnoreEDID" "yes"
>+Device  -> [X] -> Raw -> 23 -> Option = "CRT2Position" "Clone"
>+Device  -> [X] -> Raw -> 24 -> Option = "SaXDualOrientation" "LeftOf"
>+Device  -> [X] -> Raw -> 25 -> Option = "SaXDualMode" "Clone"
>+Device  -> [X] -> Raw -> 26 -> Option = "SaXDualMonitorVendor" "${Vendor}"
>+Device  -> [X] -> Raw -> 27 -> Option = "SaXDualMonitorModel" "${Model}"
>+Device  -> [X] -> Raw -> 29 -> Option = "CRT2HSync" "${Hsync}"
>+Device  -> [X] -> Raw -> 30 -> Option = "CRT2VRefresh" "${Vsync}"
>+Device  -> [X] -> Raw -> 31 -> Option = "MetaModes" "${Modes[0]},${Modes[0]}"
>+Device  -> [X] -> Raw -> 32 -> Option = "SaXDualHSync" "${Hsync}"
>+Device  -> [X] -> Raw -> 33 -> Option = "SaXDualVSync" "${Vsync}"
>+Device  -> [X] -> Raw -> 34 -> Option = "SaXDualResolution" "${Modes[0]}"
>diff -urp profile.orig/Radeon_DualHead_DriverOptions.pl profile/Radeon_DualHead_DriverOptions.pl
>--- profile.orig/Radeon_DualHead_DriverOptions.pl	2007-04-07 08:58:12.000000000 +0200
>+++ profile/Radeon_DualHead_DriverOptions.pl	2007-04-12 19:24:43.000000000 +0200
>@@ -18,6 +18,11 @@ my $profile = ProfileInitScript();
> #====================================
> # Do the profile adaptions...
> #------------------------------------
>+my $mlayout = ProfileRadeonSetupMonitorLayout ($profile);
>+
>+#====================================
>+# Do the profile adaptions...
>+#------------------------------------
> if (! ProfileIsXOrgVendor ("fglrx")) {
> 	#====================================
> 	# Call fglrx dual profile
>@@ -45,6 +50,8 @@ if (! ProfileIsXOrgVendor ("fglrx")) {
> 		print FD "SaXMeta->[X]->SAX_NO_CDB_CHECK=1\n";
> 		print FD "\$MS=Screen->[X]->Depth->16->Modes\n";
> 		print FD "Device->[X]->Option=SaXDualHead\n";
>+		print FD "$dx=\"MonitorLayout\" \"$mlayout\"\n";
>+		$dx = eval $dt;
> 		print FD "$dx=\"MergedFB\" \"yes\"\n";
> 		$dx = eval $dt;
> 		print FD "$dx=\"IgnoreEDID\" \"yes\"\n";
>@@ -81,6 +88,8 @@ if (! ProfileIsXOrgVendor ("fglrx")) {
> 		my $id = 20;
> 		my $dt = '"Device->[X]->Raw->".$id++."->Option"';
> 		my $dx = eval $dt;
>+		print FD "$dx=\"MonitorLayout\" \"$mlayout\"\n";
>+		$dx = eval $dt;
> 		print FD "$dx=\"MergedFB\" \"yes\"\n";
> 		$dx = eval $dt;
> 		print FD "$dx=\"IgnoreEDID\" \"yes\"\n";

Actions: View | Diff

Attachments on bug 263199: 130335 | 130336 | 130807 | 130808 | 131033 | 131045