i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed strange/wrong indentation.

Browse Source 
* Made sure the 80 character per line limit is honoured.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38370 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-26 12:36:52 +00:00
parent 0250598f79
commit f16be37f87
1 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/intel_extreme/mode.cpp
+63 -43
View File
@@ -821,15 +821,15 @@ if (first) {
+ (hardwareTarget.timing.h_total + (hardwareTarget.timing.h_total
- target.timing.h_display) / 2; - target.timing.h_display) / 2;
write32(INTEL_DISPLAY_B_HTOTAL, ( write32(INTEL_DISPLAY_B_HTOTAL,
(uint32)(hardwareTarget.timing.h_total - 1) << 16) ((uint32)(hardwareTarget.timing.h_total - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_B_HBLANK, ( write32(INTEL_DISPLAY_B_HBLANK,
(uint32)(hardwareTarget.timing.h_total - borderWidth / 2 - 1) ((uint32)(hardwareTarget.timing.h_total - borderWidth / 2 - 1)
<< 16) << 16)
| ((uint32)target.timing.h_display + borderWidth / 2 - 1)); | ((uint32)target.timing.h_display + borderWidth / 2 - 1));
write32(INTEL_DISPLAY_B_HSYNC, ( write32(INTEL_DISPLAY_B_HSYNC,
(uint32)(syncCenter + syncWidth / 2 - 1) << 16) ((uint32)(syncCenter + syncWidth / 2 - 1) << 16)
| ((uint32)syncCenter - syncWidth / 2 - 1)); | ((uint32)syncCenter - syncWidth / 2 - 1));
uint32 borderHeight = hardwareTarget.timing.v_display uint32 borderHeight = hardwareTarget.timing.v_display
@@ -842,11 +842,11 @@ if (first) {
+ (hardwareTarget.timing.v_total + (hardwareTarget.timing.v_total
- target.timing.v_display) / 2; - target.timing.v_display) / 2;
write32(INTEL_DISPLAY_B_VTOTAL, ( write32(INTEL_DISPLAY_B_VTOTAL,
(uint32)(hardwareTarget.timing.v_total - 1) << 16) ((uint32)(hardwareTarget.timing.v_total - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_B_VBLANK, ( write32(INTEL_DISPLAY_B_VBLANK,
(uint32)(hardwareTarget.timing.v_total - borderHeight / 2 - 1) ((uint32)(hardwareTarget.timing.v_total - borderHeight / 2 - 1)
<< 16) << 16)
| ((uint32)target.timing.v_display | ((uint32)target.timing.v_display
+ borderHeight / 2 - 1)); + borderHeight / 2 - 1));
@@ -859,37 +859,39 @@ if (first) {
// sync) // sync)
// write32(0x61020, 0x00FF0000); // write32(0x61020, 0x00FF0000);
} else { } else {
write32(INTEL_DISPLAY_B_HTOTAL, ((uint32)(target.timing.h_total - 1) write32(INTEL_DISPLAY_B_HTOTAL,
<< 16) ((uint32)(target.timing.h_total - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_B_HBLANK, ((uint32)(target.timing.h_total - 1) write32(INTEL_DISPLAY_B_HBLANK,
<< 16) ((uint32)(target.timing.h_total - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_B_HSYNC, ( write32(INTEL_DISPLAY_B_HSYNC, (
(uint32)(target.timing.h_sync_end - 1) << 16) (uint32)(target.timing.h_sync_end - 1) << 16)
| ((uint32)target.timing.h_sync_start - 1)); | ((uint32)target.timing.h_sync_start - 1));
write32(INTEL_DISPLAY_B_VTOTAL, ((uint32)(target.timing.v_total - 1) write32(INTEL_DISPLAY_B_VTOTAL,
<< 16) ((uint32)(target.timing.v_total - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_B_VBLANK, ((uint32)(target.timing.v_total - 1) write32(INTEL_DISPLAY_B_VBLANK,
<< 16) ((uint32)(target.timing.v_total - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_B_VSYNC, ( write32(INTEL_DISPLAY_B_VSYNC, (
(uint32)(target.timing.v_sync_end - 1) << 16) (uint32)(target.timing.v_sync_end - 1) << 16)
| ((uint32)target.timing.v_sync_start - 1)); | ((uint32)target.timing.v_sync_start - 1));
} }
write32(INTEL_DISPLAY_B_IMAGE_SIZE, ( write32(INTEL_DISPLAY_B_IMAGE_SIZE,
(uint32)(target.timing.h_display - 1) << 16) ((uint32)(target.timing.h_display - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_B_POS, 0); write32(INTEL_DISPLAY_B_POS, 0);
write32(INTEL_DISPLAY_B_PIPE_SIZE, ((uint32)(target.timing.v_display - 1) << 16) write32(INTEL_DISPLAY_B_PIPE_SIZE,
((uint32)(target.timing.v_display - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_B_CONTROL, (read32(INTEL_DISPLAY_B_CONTROL) write32(INTEL_DISPLAY_B_CONTROL, (read32(INTEL_DISPLAY_B_CONTROL)
& ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA)) | colorMode); & ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA))
| colorMode);
write32(INTEL_DISPLAY_B_PIPE_CONTROL, write32(INTEL_DISPLAY_B_PIPE_CONTROL,
read32(INTEL_DISPLAY_B_PIPE_CONTROL) | DISPLAY_PIPE_ENABLED); read32(INTEL_DISPLAY_B_PIPE_CONTROL) | DISPLAY_PIPE_ENABLED);
@@ -901,9 +903,12 @@ if (first) {
compute_pll_divisors(target, divisors, false); compute_pll_divisors(target, divisors, false);
write32(INTEL_DISPLAY_A_PLL_DIVISOR_0, write32(INTEL_DISPLAY_A_PLL_DIVISOR_0,
(((divisors.n - 2) << DISPLAY_PLL_N_DIVISOR_SHIFT) & DISPLAY_PLL_N_DIVISOR_MASK) (((divisors.n - 2) << DISPLAY_PLL_N_DIVISOR_SHIFT)
| (((divisors.m1 - 2) << DISPLAY_PLL_M1_DIVISOR_SHIFT) & DISPLAY_PLL_M1_DIVISOR_MASK) & DISPLAY_PLL_N_DIVISOR_MASK)
| (((divisors.m2 - 2) << DISPLAY_PLL_M2_DIVISOR_SHIFT) & DISPLAY_PLL_M2_DIVISOR_MASK)); | (((divisors.m1 - 2) << DISPLAY_PLL_M1_DIVISOR_SHIFT)
& DISPLAY_PLL_M1_DIVISOR_MASK)
| (((divisors.m2 - 2) << DISPLAY_PLL_M2_DIVISOR_SHIFT)
& DISPLAY_PLL_M2_DIVISOR_MASK));
uint32 pll = DISPLAY_PLL_ENABLED | DISPLAY_PLL_NO_VGA_CONTROL; uint32 pll = DISPLAY_PLL_ENABLED | DISPLAY_PLL_NO_VGA_CONTROL;
if (gInfo->shared_info->device_type.InFamily(INTEL_TYPE_9xx)) { if (gInfo->shared_info->device_type.InFamily(INTEL_TYPE_9xx)) {
@@ -926,8 +931,8 @@ if (first) {
pll |= DISPLAY_PLL_2X_CLOCK; pll |= DISPLAY_PLL_2X_CLOCK;
if (divisors.post1 > 2) { if (divisors.post1 > 2) {
pll |= (((divisors.post1 - 2) << DISPLAY_PLL_POST1_DIVISOR_SHIFT) pll |= ((divisors.post1 - 2) << DISPLAY_PLL_POST1_DIVISOR_SHIFT)
& DISPLAY_PLL_POST1_DIVISOR_MASK); & DISPLAY_PLL_POST1_DIVISOR_MASK;
} else } else
pll |= DISPLAY_PLL_POST1_DIVIDE_2; pll |= DISPLAY_PLL_POST1_DIVIDE_2;
} }
@@ -940,27 +945,38 @@ if (first) {
spin(150); spin(150);
// update timing parameters // update timing parameters
write32(INTEL_DISPLAY_A_HTOTAL, ((uint32)(target.timing.h_total - 1) << 16) write32(INTEL_DISPLAY_A_HTOTAL,
((uint32)(target.timing.h_total - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_A_HBLANK, ((uint32)(target.timing.h_total - 1) << 16) write32(INTEL_DISPLAY_A_HBLANK,
((uint32)(target.timing.h_total - 1) << 16)
| ((uint32)target.timing.h_display - 1)); | ((uint32)target.timing.h_display - 1));
write32(INTEL_DISPLAY_A_HSYNC, ((uint32)(target.timing.h_sync_end - 1) << 16) write32(INTEL_DISPLAY_A_HSYNC,
((uint32)(target.timing.h_sync_end - 1) << 16)
| ((uint32)target.timing.h_sync_start - 1)); | ((uint32)target.timing.h_sync_start - 1));
write32(INTEL_DISPLAY_A_VTOTAL, ((uint32)(target.timing.v_total - 1) << 16) write32(INTEL_DISPLAY_A_VTOTAL,
((uint32)(target.timing.v_total - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_A_VBLANK, ((uint32)(target.timing.v_total - 1) << 16) write32(INTEL_DISPLAY_A_VBLANK,
((uint32)(target.timing.v_total - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_A_VSYNC, ((uint32)(target.timing.v_sync_end - 1) << 16) write32(INTEL_DISPLAY_A_VSYNC,
((uint32)(target.timing.v_sync_end - 1) << 16)
| ((uint32)target.timing.v_sync_start - 1)); | ((uint32)target.timing.v_sync_start - 1));
write32(INTEL_DISPLAY_A_IMAGE_SIZE, ((uint32)(target.timing.h_display - 1) << 16) write32(INTEL_DISPLAY_A_IMAGE_SIZE,
((uint32)(target.timing.h_display - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_A_ANALOG_PORT, (read32(INTEL_DISPLAY_A_ANALOG_PORT) write32(INTEL_DISPLAY_A_ANALOG_PORT,
& ~(DISPLAY_MONITOR_POLARITY_MASK | DISPLAY_MONITOR_VGA_POLARITY)) (read32(INTEL_DISPLAY_A_ANALOG_PORT)
| ((target.timing.flags & B_POSITIVE_HSYNC) != 0 ? DISPLAY_MONITOR_POSITIVE_HSYNC : 0) & ~(DISPLAY_MONITOR_POLARITY_MASK
| ((target.timing.flags & B_POSITIVE_VSYNC) != 0 ? DISPLAY_MONITOR_POSITIVE_VSYNC : 0)); | DISPLAY_MONITOR_VGA_POLARITY))
| ((target.timing.flags & B_POSITIVE_HSYNC) != 0
? DISPLAY_MONITOR_POSITIVE_HSYNC : 0)
| ((target.timing.flags & B_POSITIVE_VSYNC) != 0
? DISPLAY_MONITOR_POSITIVE_VSYNC : 0));
// TODO: verify the two comments below: the X driver doesn't seem to // TODO: verify the two comments below: the X driver doesn't seem to
// care about both of them! // care about both of them!
@@ -969,20 +985,24 @@ if (first) {
// that the second head always must adopt the color space of the first // that the second head always must adopt the color space of the first
// head. // head.
write32(INTEL_DISPLAY_A_CONTROL, (read32(INTEL_DISPLAY_A_CONTROL) write32(INTEL_DISPLAY_A_CONTROL, (read32(INTEL_DISPLAY_A_CONTROL)
& ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA)) | colorMode); & ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA))
| colorMode);
if (gInfo->head_mode & HEAD_MODE_B_DIGITAL) { if ((gInfo->head_mode & HEAD_MODE_B_DIGITAL) != 0) {
write32(INTEL_DISPLAY_B_IMAGE_SIZE, ((uint32)(target.timing.h_display - 1) << 16) write32(INTEL_DISPLAY_B_IMAGE_SIZE,
((uint32)(target.timing.h_display - 1) << 16)
| ((uint32)target.timing.v_display - 1)); | ((uint32)target.timing.v_display - 1));
write32(INTEL_DISPLAY_B_CONTROL, (read32(INTEL_DISPLAY_B_CONTROL) write32(INTEL_DISPLAY_B_CONTROL, (read32(INTEL_DISPLAY_B_CONTROL)
& ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA)) | colorMode); & ~(DISPLAY_CONTROL_COLOR_MASK | DISPLAY_CONTROL_GAMMA))
| colorMode);
} }
} }
set_display_power_mode(sharedInfo.dpms_mode); set_display_power_mode(sharedInfo.dpms_mode);
// changing bytes per row seems to be ignored if the plane/pipe is turned off // Changing bytes per row seems to be ignored if the plane/pipe is turned
// off
if (gInfo->head_mode & HEAD_MODE_A_ANALOG) if (gInfo->head_mode & HEAD_MODE_A_ANALOG)
write32(INTEL_DISPLAY_A_BYTES_PER_ROW, bytesPerRow); write32(INTEL_DISPLAY_A_BYTES_PER_ROW, bytesPerRow);