Attachment 191860 Details for Bug 351627

[patch] Profile patch for radeonhd

sax2_radeonhd_profile.diff (text/plain), 11.19 KB, created by Matthias Hopf on 2008-01-25 17:11:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2008-01-25 17:11:39 UTC

Size: 11.19 KB

patch

obsolete

>diff -urp ./sysp/maps/Driver.map.orig ./sysp/maps/Driver.map
>--- ./sysp/maps/Driver.map.orig	2008-01-25 18:01:04.000000000 +0100
>+++ ./sysp/maps/Driver.map	2008-01-25 17:26:11.000000000 +0100
>@@ -12,3 +12,4 @@ fglrx    : FireGL
> tseng    : VideoRAM
> intel    : Depth24,Intel
> fbdev    : NoModelines
>+radeonhd : Depth24,RadeonHD
>diff -urp ./profile/Profile.pm.orig ./profile/Profile.pm
>--- ./profile/Profile.pm.orig	2008-01-25 17:04:45.000000000 +0100
>+++ ./profile/Profile.pm	2008-01-25 17:50:04.000000000 +0100
>@@ -573,4 +573,73 @@ sub ProfileSortRandrData {
> 	return @sortedChannels;
> }
> 
>+#=====================================
>+# ProfileSortRandrData
>+#-------------------------------------
>+sub ProfileSortRandrDataForRadeonHD {
>+	my $rroutput = shift;
>+	my @channels = split ("%",$rroutput);
>+	my @sortedChannels = ();
>+	my $index = -1;
>+	# /.../
>+	# assume first channel is internal display
>+	# skip the internal display
>+	# ----
>+	foreach my $channel (@channels) {
>+		my @data = split (" ",$channel); $index++;
>+		if ( $data[1] ne "connected") {
>+			next;
>+		}
>+		delete $channels[$index];
>+		last;
>+	}
>+	$index = 10;
>+	foreach my $channel (@channels) {
>+		my @data = split (" ",$channel);
>+		my $outputName  = $data[0];
>+		my $outputState = $data[1];
>+		# /.../
>+		# activate all connected output channels
>+		# in a specific order
>+		# ----
>+		if ($outputState ne "connected") {
>+			next;
>+		}
>+		if ($outputName eq "PANEL") {
>+			$sortedChannels[0] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-I_1/) {
>+			$sortedChannels[1] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-I_2/) {
>+			$sortedChannels[2] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-D_1/) {
>+			$sortedChannels[3] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-D_2/) {
>+			$sortedChannels[4] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-I/) {
>+			$sortedChannels[5] = $outputName;
>+		}
>+		elsif ($outputName =~ /^DVI-D/) {
>+			$sortedChannels[6] = $outputName;
>+		}
>+		elsif ($outputName =~ /^VGA_1/) {
>+			$sortedChannels[7] = $outputName;
>+		}
>+		elsif ($outputName =~ /^VGA_2/) {
>+			$sortedChannels[8] = $outputName;
>+		}
>+		elsif ($outputName =~ /^VGA/) {
>+			$sortedChannels[9] = $outputName;
>+		} else {
>+			$sortedChannels[$index] = $outputName;
>+			$index++;
>+		}
>+	}
>+	return @sortedChannels;
>+}
>+
> 1;
>diff -urp ./profile/MergedFB.pl.orig ./profile/MergedFB.pl
>--- ./profile/MergedFB.pl.orig	2008-01-25 15:26:42.000000000 +0100
>+++ ./profile/MergedFB.pl	2008-01-25 17:15:37.000000000 +0100
>@@ -29,6 +29,9 @@ sub getProfile {
> 		/^nvidia/    && do {
> 			return "$dir/NVidia_DualHead_DriverOptions";
> 		};
>+		/^radeonhd/    && do {
>+			return "$dir/RadeonHD_DualHead_DriverOptions";
>+		};
> 		/^radeon/    && do {
> 			return "$dir/Radeon_DualHead_DriverOptions";
> 		};
>diff -urp ./profile/RadeonHD.orig ./profile/RadeonHD
>--- ./profile/RadeonHD.orig	1970-01-01 01:00:00.000000000 +0100
>+++ ./profile/RadeonHD	2008-01-25 17:45:52.000000000 +0100
>@@ -0,0 +1,6 @@
>+# /.../
>+# RadeonHD driver profile which adds the option monitor-X -> Monitor[0]
>+# to the primary monitor section for the radeonhd driver
>+# ---- 
>+# dynamic profile
>+#
>diff -urp ./profile/RadeonHD.pl.orig ./profile/RadeonHD.pl
>--- ./profile/RadeonHD.pl.orig	1970-01-01 01:00:00.000000000 +0100
>+++ ./profile/RadeonHD.pl	2008-01-25 15:01:26.000000000 +0100
>@@ -0,0 +1,48 @@
>+#!/usr/bin/perl
>+
>+use lib '/usr/share/sax/profile';
>+
>+use strict;
>+use Profile;
>+
>+#====================================
>+# Init profile script
>+#------------------------------------
>+my $profile = ProfileInitScript();
>+
>+#=====================================
>+# get SYSP xstuff data
>+#-------------------------------------
>+my $outputName;
>+my $xstuff = new SaX::SaXImportSysp ($SaX::SYSP_DESKTOP);
>+$xstuff->doImport();
>+my $rroutput = $xstuff->getItem("RandR");
>+my $randrok  = 1;
>+if ((! defined $rroutput) || ($rroutput eq "<undefined>")) {
>+	$randrok = 0;
>+}
>+if ($randrok) {
>+	#=====================================
>+	# use first randr plugin as primary
>+	#-------------------------------------
>+	my @channels = split ("%",$rroutput);
>+	foreach my $channel (@channels) {
>+		my @data = split (" ",$channel);
>+		my $outputState = $data[1];
>+		if ($outputState ne "connected") {
>+			next;
>+		}
>+		$outputName = $data[0];
>+		last;
>+	}
>+}
>+#====================================
>+# Do the profile adaptions...
>+#------------------------------------
>+open (FD,">",$profile) ||
>+	die "RadeonHD: Can't open $profile: $!";
>+if (defined $outputName) {
>+	print FD "Device -> [X] -> Raw -> 18 -> Option = ";
>+	print FD "\"monitor-$outputName\" \"Monitor[0]\"\n";
>+}
>+close FD;
>diff -urp ./profile/RadeonHD_DualHead_DriverOptions.orig ./profile/RadeonHD_DualHead_DriverOptions
>--- ./profile/RadeonHD_DualHead_DriverOptions.orig	1970-01-01 01:00:00.000000000 +0100
>+++ ./profile/RadeonHD_DualHead_DriverOptions	2008-01-25 15:02:09.000000000 +0100
>@@ -0,0 +1,23 @@
>+# /.../
>+# profile to setup the second channel on an
>+# radeonhd based dual head card
>+# -----------------------------
>+SaXMeta -> [X] ->  SAX_NO_CDB_CHECK = 1
>+
>+$Modes  = Screen  -> [X] -> Depth -> 16 -> Modes
>+$Hsync  = Monitor -> [X] -> HorizSync
>+$Vsync  = Monitor -> [X] -> VertRefresh
>+$Vendor = Monitor -> [X] -> VendorName
>+$Model  = Monitor -> [X] -> ModelName
>+
>+Device  -> [X] -> Option = SaXDualHead
>+
>+Device  -> [X] -> Raw -> 21 -> Option = "SaXDualMode" "Clone"
>+Device  -> [X] -> Raw -> 22 -> Option = "SaXDualOrientation" "LeftOf"
>+Device  -> [X] -> Raw -> 23 -> Option = "SaXDualHSync" "${Hsync}"
>+Device  -> [X] -> Raw -> 24 -> Option = "SaXDualVSync" "${Vsync}"
>+Device  -> [X] -> Raw -> 25 -> Option = "SaXDualResolution" "${Modes[0]}"
>+Device  -> [X] -> Raw -> 26 -> Option = "SaXDualMonitorVendor" "${Vendor}"
>+Device  -> [X] -> Raw -> 27 -> Option = "SaXDualMonitorModel" "${Model}"
>+
>+Device  -> [X] -> Raw -> 28 -> Option = "SaXExternal" "Identifier__AND__EXT__PLUS__VertRefresh__AND__${Vsync}__PLUS__HorizSync__AND__${Hsync}__PLUS__PreferredMode__AND__${Modes[0]}__PLUS__VendorName__AND__${Vendor}__PLUS__ModelName__AND__${Model}"
>diff -urp ./profile/RadeonHD_DualHead_DriverOptions.pl.orig ./profile/RadeonHD_DualHead_DriverOptions.pl
>--- ./profile/RadeonHD_DualHead_DriverOptions.pl.orig	1970-01-01 01:00:00.000000000 +0100
>+++ ./profile/RadeonHD_DualHead_DriverOptions.pl	2008-01-25 17:47:16.000000000 +0100
>@@ -0,0 +1,170 @@
>+#!/usr/bin/perl
>+
>+use lib '/usr/share/sax/profile';
>+
>+use strict;
>+use Profile;
>+
>+#====================================
>+# Profile name...
>+#------------------------------------
>+my $name = "RadeonHD_DualHead_DriverOptions";
>+
>+#====================================
>+# Init profile script
>+#------------------------------------
>+my $profile = ProfileInitScript();
>+
>+#====================================
>+# get DisplaySize for second channel
>+#------------------------------------
>+my %data = ProfileGetDDC2Data();
>+my $Size;
>+foreach my $key (keys %data) {
>+	my $val = $data{$key};
>+	SWITCH: for ($key) {
>+		/^Size/       && do {
>+			$Size = $val;
>+			last SWITCH;
>+		};
>+	}
>+}
>+#=====================================
>+# get SYSP xstuff data
>+#-------------------------------------
>+my $xstuff = new SaX::SaXImportSysp ($SaX::SYSP_DESKTOP);
>+$xstuff->doImport();
>+my $rroutput = $xstuff->getItem("RandR");
>+my $randrok  = 1;
>+if ((! defined $rroutput) || ($rroutput eq "<undefined>")) {
>+	$randrok = 0;
>+}
>+#====================================
>+# Do the profile adaptions...
>+#------------------------------------
>+if (ProfileIsNoteBookHardware()) {
>+	open (FD,">",$profile) ||
>+		die "$name: Can't open $profile: $!";
>+	my $id = 21;
>+	my $dt = '"Device->[X]->Raw->".$id++."->Option"';
>+	my $dx = eval $dt;
>+	print FD "SaXMeta->[X]->SAX_NO_CDB_CHECK=1\n";
>+	print FD "\$MS=Screen->[X]->Depth->16->Modes\n";
>+	print FD "\$Hsync=Monitor->[X]->HorizSync\n";
>+	print FD "\$Vsync=Monitor->[X]->VertRefresh\n";
>+	print FD "Device->[X]->Option=SaXDualHead\n";
>+	print FD "$dx=\"SaXDualMode\" \"Clone\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualOrientation\" \"LeftOf\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualHSync\" \"31-48\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualVSync\" \"50-60\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualResolution\" \"1024x768\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualMonitorVendor\" \"__VESA__\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualMonitorModel\" \"1024X768\@60HZ\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXExternal\" \"Identifier__AND__EXT__PLUS__VertRefresh__AND__50-60__PLUS__HorizSync__AND__31-48__PLUS__PreferredMode__AND__1024x768__PLUS__VendorName__AND____VESA____PLUS__ModelName__AND__1024X768\@60HZ";
>+	if (defined $Size) {
>+		print FD "__PLUS__DisplaySize__AND__$Size\"\n";
>+	} else {
>+		print FD "\"\n";
>+	}
>+	if ($randrok) {
>+		#=====================================
>+		# setup randr plugin data
>+		#-------------------------------------
>+		my @sortedChannels = ProfileSortRandrData ($rroutput);
>+		foreach my $outputName (@sortedChannels) {
>+			if ((defined $outputName) && ($outputName ne "")) {
>+				$dx = eval $dt;
>+				print FD "$dx=\"monitor-$outputName\" \"EXT\"\n";
>+			}
>+		}
>+	}
>+	close FD;
>+} else {
>+	#====================================
>+	# check secondary DDC data
>+	#------------------------------------
>+	open (FD,">>",$profile) ||
>+		die "$name: Can't open $profile: $!";
>+	my %data   = ProfileGetDDC2Data();
>+	my $id = 21;
>+	my $dt = '"Device->[X]->Raw->".$id++."->Option"';
>+	my $dx = eval $dt;
>+	print FD "$dx=\"SaXDualMode\" \"Clone\"\n";
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXDualOrientation\" \"LeftOf\"\n";
>+	$dx = eval $dt;
>+	my $Hsync  = '${Hsync}';
>+	my $Vsync  = '${Vsync}';
>+	my $Vendor = '${Vendor}';
>+	my $Model  = '${Model}'; 
>+	my $Modes  = '${Modes[0]}';
>+	foreach my $key (keys %data) {
>+		my $val = $data{$key};
>+		SWITCH: for ($key) {
>+			/^Model/      && do {
>+				$id = 27;
>+				$dx = eval $dt;
>+				print FD "$dx=\"SaXDualMonitorModel\" \"$val\"\n";
>+				$Model = $val;
>+				last SWITCH;
>+			};
>+			/^Vendor/     && do {
>+				$id = 26;
>+				$dx = eval $dt;
>+				print FD "$dx=\"SaXDualMonitorVendor\" \"$val\"\n";
>+				$Vendor = $val;
>+				last SWITCH;
>+			};
>+			/^Resolution/ && do {
>+				$id = 25;
>+				$dx = eval $dt;
>+				print FD "$dx=\"SaXDualResolution\" \"$val\"\n";
>+				$Modes = $val;
>+				last SWITCH;
>+			};
>+			/^Hsync/      && do {
>+				$id = 23;
>+				$dx = eval $dt;
>+				print FD "$dx=\"SaXDualHSync\" \"$val\"\n";
>+				$Hsync = $val;
>+				last SWITCH;
>+			};
>+			/^Vsync/      && do {
>+				$id = 24;
>+				$dx = eval $dt;
>+				print FD "$dx=\"SaXDualVSync\" \"$val\"\n";
>+				$Vsync = $val;
>+				last SWITCH;
>+			};
>+		}
>+	}
>+	$id = 28;
>+	$dx = eval $dt;
>+	print FD "$dx=\"SaXExternal\" \"Identifier__AND__EXT__PLUS__VertRefresh__AND__".$Vsync."__PLUS__HorizSync__AND__".$Hsync."__PLUS__PreferredMode__AND__".$Modes."__PLUS__VendorName__AND__".$Vendor."__PLUS__ModelName__AND__".$Model;
>+	if (defined $Size) {
>+		print FD "__PLUS__DisplaySize__AND__$Size\"\n";
>+	} else {
>+		print FD "\"\n";
>+	}
>+	if ($randrok) {
>+		#=====================================
>+		# setup randr plugin data
>+		#-------------------------------------
>+		my @sortedChannels = ProfileSortRandrDataForRadeonHD ($rroutput);
>+		foreach my $outputName (@sortedChannels) {
>+			if ((defined $outputName) && ($outputName ne "")) {
>+				$dx = eval $dt;
>+				print FD "$dx=\"monitor-$outputName\" \"EXT\"\n";
>+print STDERR "$dx=\"monitor-$outputName\" \"EXT\"\n";
>+			}
>+		}
>+	}
>+	close FD;
>+}

Actions: View | Diff

Attachments on bug 351627: 191859 | 191860 | 195738