Attachment #191860 for bug #351627

View | Details | Raw Unified | Return to bug 351627
Collapse All | Expand All

Lines 12-14 fglrx : FireGL Link Here

(-)./sysp/maps/Driver.map.orig (+1 lines)
12	tseng : VideoRAM	12	tseng : VideoRAM
13	intel : Depth24,Intel	13	intel : Depth24,Intel
14	fbdev : NoModelines	14	fbdev : NoModelines
		15	radeonhd : Depth24,RadeonHD




	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;

Lines 29-34 sub getProfile { Link Here

(-)./profile/MergedFB.pl.orig (+3 lines)
29	/^nvidia/ && do {	29	/^nvidia/ && do {
30	return "$dir/NVidia_DualHead_DriverOptions";	30	return "$dir/NVidia_DualHead_DriverOptions";
31	};	31	};
		32	/^radeonhd/ && do {
		33	return "$dir/RadeonHD_DualHead_DriverOptions";
		34	};
32	/^radeon/ && do {	35	/^radeon/ && do {
33	return "$dir/Radeon_DualHead_DriverOptions";	36	return "$dir/Radeon_DualHead_DriverOptions";
34	};	37	};

Line 0 Link Here

(-)./profile/RadeonHD.orig (+6 lines)
	1	# /.../
	2	# RadeonHD driver profile which adds the option monitor-X -> Monitor[0]
	3	# to the primary monitor section for the radeonhd driver
	4	# ----
	5	# dynamic profile
	6	#

Line 0 Link Here

(-)./profile/RadeonHD.pl.orig (+48 lines)
	1	#!/usr/bin/perl
	2
	3	use lib '/usr/share/sax/profile';
	4
	5	use strict;
	6	use Profile;
	7
	8	#====================================
	9	# Init profile script
	10	#------------------------------------
	11	my $profile = ProfileInitScript();
	12
	13	#=====================================
	14	# get SYSP xstuff data
	15	#-------------------------------------
	16	my $outputName;
	17	my $xstuff = new SaX::SaXImportSysp ($SaX::SYSP_DESKTOP);
	18	$xstuff->doImport();
	19	my $rroutput = $xstuff->getItem("RandR");
	20	my $randrok = 1;
	21	if ((! defined $rroutput) \|\| ($rroutput eq "<undefined>")) {
	22	$randrok = 0;
	23	}
	24	if ($randrok) {
	25	#=====================================
	26	# use first randr plugin as primary
	27	#-------------------------------------
	28	my @channels = split ("%",$rroutput);
	29	foreach my $channel (@channels) {
	30	my @data = split (" ",$channel);
	31	my $outputState = $data[1];
	32	if ($outputState ne "connected") {
	33	next;
	34	}
	35	$outputName = $data[0];
	36	last;
	37	}
	38	}
	39	#====================================
	40	# Do the profile adaptions...
	41	#------------------------------------
	42	open (FD,">",$profile) \|\|
	43	die "RadeonHD: Can't open $profile: $!";
	44	if (defined $outputName) {
	45	print FD "Device -> [X] -> Raw -> 18 -> Option = ";
	46	print FD "\"monitor-$outputName\" \"Monitor[0]\"\n";
	47	}
	48	close FD;




# /.../
# 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}"




#!/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;
}

Return to bug 351627

Lines 573-576 sub ProfileSortRandrData { Link Here

(-)./profile/Profile.pm.orig (+69 lines)
573	return @sortedChannels;	573	return @sortedChannels;
574	}	574	}
575		575
		576	#=====================================
		577	# ProfileSortRandrData
		578	#-------------------------------------
		579	sub ProfileSortRandrDataForRadeonHD {
		580	my $rroutput = shift;
		581	my @channels = split ("%",$rroutput);
		582	my @sortedChannels = ();
		583	my $index = -1;
		584	# /.../
		585	# assume first channel is internal display
		586	# skip the internal display
		587	# ----
		588	foreach my $channel (@channels) {
		589	my @data = split (" ",$channel); $index++;
		590	if ( $data[1] ne "connected") {
		591	next;
		592	}
		593	delete $channels[$index];
		594	last;
		595	}
		596	$index = 10;
		597	foreach my $channel (@channels) {
		598	my @data = split (" ",$channel);
		599	my $outputName = $data[0];
		600	my $outputState = $data[1];
		601	# /.../
		602	# activate all connected output channels
		603	# in a specific order
		604	# ----
		605	if ($outputState ne "connected") {
		606	next;
		607	}
		608	if ($outputName eq "PANEL") {
		609	$sortedChannels[0] = $outputName;
		610	}
		611	elsif ($outputName =~ /^DVI-I_1/) {
		612	$sortedChannels[1] = $outputName;
		613	}
		614	elsif ($outputName =~ /^DVI-I_2/) {
		615	$sortedChannels[2] = $outputName;
		616	}
		617	elsif ($outputName =~ /^DVI-D_1/) {
		618	$sortedChannels[3] = $outputName;
		619	}
		620	elsif ($outputName =~ /^DVI-D_2/) {
		621	$sortedChannels[4] = $outputName;
		622	}
		623	elsif ($outputName =~ /^DVI-I/) {
		624	$sortedChannels[5] = $outputName;
		625	}
		626	elsif ($outputName =~ /^DVI-D/) {
		627	$sortedChannels[6] = $outputName;
		628	}
		629	elsif ($outputName =~ /^VGA_1/) {
		630	$sortedChannels[7] = $outputName;
		631	}
		632	elsif ($outputName =~ /^VGA_2/) {
		633	$sortedChannels[8] = $outputName;
		634	}
		635	elsif ($outputName =~ /^VGA/) {
		636	$sortedChannels[9] = $outputName;
		637	} else {
		638	$sortedChannels[$index] = $outputName;
		639	$index++;
640	}
641	}
642	return @sortedChannels;
643	}
644
576	1;	645	1;

Line 0 Link Here

(-)./profile/RadeonHD_DualHead_DriverOptions.orig (+23 lines)
	1	# /.../
	2	# profile to setup the second channel on an
	3	# radeonhd based dual head card
	4	# -----------------------------
	5	SaXMeta -> [X] -> SAX_NO_CDB_CHECK = 1
	6
	7	$Modes = Screen -> [X] -> Depth -> 16 -> Modes
	8	$Hsync = Monitor -> [X] -> HorizSync
	9	$Vsync = Monitor -> [X] -> VertRefresh
	10	$Vendor = Monitor -> [X] -> VendorName
	11	$Model = Monitor -> [X] -> ModelName
	12
	13	Device -> [X] -> Option = SaXDualHead
	14
	15	Device -> [X] -> Raw -> 21 -> Option = "SaXDualMode" "Clone"
	16	Device -> [X] -> Raw -> 22 -> Option = "SaXDualOrientation" "LeftOf"
	17	Device -> [X] -> Raw -> 23 -> Option = "SaXDualHSync" "${Hsync}"
	18	Device -> [X] -> Raw -> 24 -> Option = "SaXDualVSync" "${Vsync}"
	19	Device -> [X] -> Raw -> 25 -> Option = "SaXDualResolution" "${Modes[0]}"
	20	Device -> [X] -> Raw -> 26 -> Option = "SaXDualMonitorVendor" "${Vendor}"
	21	Device -> [X] -> Raw -> 27 -> Option = "SaXDualMonitorModel" "${Model}"
	22
	23	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}"