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

* Style Cleanup

Browse Source 
* Remove some un-needed test stuff
* Perform a little re-ordering
* Make scale corrections


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42390 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-07-08 04:25:21 +00:00
parent d97da786e1
commit eb5c4b0745
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/mode.cpp
+13 -23
View File
@@ -130,11 +130,8 @@ get_color_space_format(const display_mode &mode, uint32 &colorMode,
static void static void
CardBlankSet(bool blank) CardBlankSet(bool blank)
{ {
int blackColorReg; int blackColorReg = D1CRTC_BLACK_COLOR;
int blankControlReg; int blankControlReg = D1CRTC_BLANK_CONTROL;
blackColorReg = D1CRTC_BLACK_COLOR;
blankControlReg = D1CRTC_BLANK_CONTROL;
Write32(CRT, blackColorReg, 0); Write32(CRT, blackColorReg, 0);
Write32Mask(CRT, blankControlReg, blank ? 1 << 8 : 0, 1 << 8); Write32Mask(CRT, blankControlReg, blank ? 1 << 8 : 0, 1 << 8);
@@ -209,6 +206,8 @@ CardFBSet(display_mode *mode)
Write32(CRT, gRegister->grphYEnd, mode->virtual_height); Write32(CRT, gRegister->grphYEnd, mode->virtual_height);
Write32(CRT, gRegister->grphPitch, bytesPerRow / 4); Write32(CRT, gRegister->grphPitch, bytesPerRow / 4);
Write32(CRT, gRegister->modeDesktopHeight, mode->virtual_height);
Write32(CRT, gRegister->grphUpdate, 0); Write32(CRT, gRegister->grphUpdate, 0);
// Unlock changed registers // Unlock changed registers
@@ -291,10 +290,9 @@ static void
CardModeScale(display_mode *mode) CardModeScale(display_mode *mode)
{ {
// No scaling // No scaling
Write32(CRT, gRegister->sclUpdate, (1<<16));// Lock //Write32(CRT, gRegister->sclUpdate, (1<<16));// Lock
Write32(CRT, gRegister->modeDesktopHeight, mode->virtual_height);
// For now, no overscan support // For now, default overscan
Write32(CRT, D1MODE_EXT_OVERSCAN_LEFT_RIGHT, Write32(CRT, D1MODE_EXT_OVERSCAN_LEFT_RIGHT,
(OVERSCAN << 16) | OVERSCAN); // LEFT | RIGHT (OVERSCAN << 16) | OVERSCAN); // LEFT | RIGHT
Write32(CRT, D1MODE_EXT_OVERSCAN_TOP_BOTTOM, Write32(CRT, D1MODE_EXT_OVERSCAN_TOP_BOTTOM,
@@ -305,9 +303,9 @@ CardModeScale(display_mode *mode)
mode->timing.v_display | (mode->timing.h_display << 16)); mode->timing.v_display | (mode->timing.h_display << 16));
Write32(CRT, gRegister->sclEnable, 0); Write32(CRT, gRegister->sclEnable, 0);
Write32(CRT, gRegister->sclTapControl, 0); Write32(CRT, gRegister->sclTapControl, 0);
Write32(CRT, gRegister->modeCenter, 0); Write32(CRT, gRegister->modeCenter, 2);
// D1MODE_DATA_FORMAT? // D1MODE_DATA_FORMAT?
Write32(CRT, gRegister->sclUpdate, 0); // Unlock //Write32(CRT, gRegister->sclUpdate, 0); // Unlock
} }
@@ -318,26 +316,18 @@ radeon_set_display_mode(display_mode *mode)
init_registers(crtNumber); init_registers(crtNumber);
CardBlankSet(true);
CardFBSet(mode); CardFBSet(mode);
CardBlankSet(false); CardModeSet(mode);
CardModeScale(mode); CardModeScale(mode);
#if 0
PLLSet(0, mode->timing.pixel_clock); PLLSet(0, mode->timing.pixel_clock);
// Set pixel clock // Set pixel clock
#endif
CardModeSet(mode); Write32(CRT, D1GRPH_LUT_SEL, 0);
DACSet(crtNumber, 0); DACSet(crtNumber, 0);
// Set DAC A to crt 0 // Set DAC A to crt 0
DACPower(crtNumber, RHD_POWER_ON); DACPower(crtNumber, RHD_POWER_ON);
CardBlankSet(false);
// ensure graphics are enabled and powered on (CRT Power)
Write32Mask(CRT, D1GRPH_ENABLE, 0x00000001, 0x00000001);
snooze(2);
Write32(CRT, gRegister->crtControl, 0x01000101);
Read32(CRT, gRegister->crtControl);
Write32(CRT, gRegister->crtControl, 0x00010101);
int32 crtstatus = Read32(CRT, D1CRTC_STATUS); int32 crtstatus = Read32(CRT, D1CRTC_STATUS);
TRACE("CRT0 Status: 0x%X\n", crtstatus); TRACE("CRT0 Status: 0x%X\n", crtstatus);
src/add-ons/accelerants/radeon_hd/pll.cpp
-1
View File
@@ -448,7 +448,6 @@ PLLSetLowR620(uint8 pllIndex, uint32 pixelClock, uint16 reference,
Write32Mask(PLL, pllCntl, 0, 0x80000000); Write32Mask(PLL, pllCntl, 0, 0x80000000);
// needed and undocumented // needed and undocumented
// TODO : If CRT2 ah-la R500PLLCRTCGrab
PLLCRTCGrab(pllIndex, false); PLLCRTCGrab(pllIndex, false);
if (hasDccg) if (hasDccg)