[haiku-commits] r42390 - haiku/trunk/src/add-ons/accelerants/radeon_hd

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 8 Jul 2011 06:25:21 +0200 (CEST)

Author: kallisti5
Date: 2011-07-08 06:25:21 +0200 (Fri, 08 Jul 2011)
New Revision: 42390
Changeset: https://dev.haiku-os.org/changeset/42390

Modified:
   haiku/trunk/src/add-ons/accelerants/radeon_hd/mode.cpp
   haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp
Log:
* Style Cleanup
* Remove some un-needed test stuff
* Perform a little re-ordering
* Make scale corrections


Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/mode.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/mode.cpp      2011-07-08 
03:35:01 UTC (rev 42389)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/mode.cpp      2011-07-08 
04:25:21 UTC (rev 42390)
@@ -130,12 +130,9 @@
 static void
 CardBlankSet(bool blank)
 {
-       int blackColorReg;
-       int blankControlReg;
+       int blackColorReg = D1CRTC_BLACK_COLOR;
+       int blankControlReg = D1CRTC_BLANK_CONTROL;
 
-       blackColorReg = D1CRTC_BLACK_COLOR;
-       blankControlReg = D1CRTC_BLANK_CONTROL;
-
        Write32(CRT, blackColorReg, 0);
        Write32Mask(CRT, blankControlReg, blank ? 1 << 8 : 0, 1 << 8);
 }
@@ -209,6 +206,8 @@
        Write32(CRT, gRegister->grphYEnd, mode->virtual_height);
        Write32(CRT, gRegister->grphPitch, bytesPerRow / 4);
 
+       Write32(CRT, gRegister->modeDesktopHeight, mode->virtual_height);
+
        Write32(CRT, gRegister->grphUpdate, 0);
                // Unlock changed registers
 
@@ -291,10 +290,9 @@
 CardModeScale(display_mode *mode)
 {
        // No scaling
-       Write32(CRT, gRegister->sclUpdate, (1<<16));// Lock
-       Write32(CRT, gRegister->modeDesktopHeight, mode->virtual_height);
+       //Write32(CRT, gRegister->sclUpdate, (1<<16));// Lock
 
-       // For now, no overscan support
+       // For now, default overscan
        Write32(CRT, D1MODE_EXT_OVERSCAN_LEFT_RIGHT,
                (OVERSCAN << 16) | OVERSCAN); // LEFT | RIGHT
        Write32(CRT, D1MODE_EXT_OVERSCAN_TOP_BOTTOM,
@@ -305,9 +303,9 @@
                mode->timing.v_display | (mode->timing.h_display << 16));
        Write32(CRT, gRegister->sclEnable, 0);
        Write32(CRT, gRegister->sclTapControl, 0);
-       Write32(CRT, gRegister->modeCenter, 0);
+       Write32(CRT, gRegister->modeCenter, 2);
        // D1MODE_DATA_FORMAT?
-       Write32(CRT, gRegister->sclUpdate, 0);          // Unlock
+       //Write32(CRT, gRegister->sclUpdate, 0);                // Unlock
 }
 
 
@@ -318,27 +316,19 @@
 
        init_registers(crtNumber);
 
-       CardBlankSet(true);
        CardFBSet(mode);
-       CardBlankSet(false);
+       CardModeSet(mode);
        CardModeScale(mode);
-       #if 0
        PLLSet(0, mode->timing.pixel_clock);
                // Set pixel clock
-       #endif
-       CardModeSet(mode);
+
+       Write32(CRT, D1GRPH_LUT_SEL, 0);
+
        DACSet(crtNumber, 0);
                // Set DAC A to crt 0
        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);
        TRACE("CRT0 Status: 0x%X\n", crtstatus);
 

Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp       2011-07-08 
03:35:01 UTC (rev 42389)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/pll.cpp       2011-07-08 
04:25:21 UTC (rev 42390)
@@ -448,7 +448,6 @@
        Write32Mask(PLL, pllCntl, 0, 0x80000000);
                // needed and undocumented
 
-       // TODO : If CRT2 ah-la R500PLLCRTCGrab
        PLLCRTCGrab(pllIndex, false);
 
        if (hasDccg)


Other related posts:

  • » [haiku-commits] r42390 - haiku/trunk/src/add-ons/accelerants/radeon_hd - kallisti5