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

Author: kallisti5
Date: 2011-09-21 23:36:00 +0200 (Wed, 21 Sep 2011)
New Revision: 42762
Changeset: https://dev.haiku-os.org/changeset/42762

Modified:
   haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
   haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
   haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.cpp
   haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.h
Log:
* correct some naming after deeper investigation of
  linux drm driver.  Seems radeon_hd isn't limited to the
  standard 0xa0 i2c slave address.


Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h  2011-09-20 
13:39:40 UTC (rev 42761)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h  2011-09-21 
21:36:00 UTC (rev 42762)
@@ -142,7 +142,7 @@
        bool    valid;
        bool    hw_capable;
 
-       uint8   pin;
+       uint8   i2c_slave_addr;
 
        uint32  mask_scl_reg;
        uint32  mask_sda_reg;

Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp   2011-09-20 
13:39:40 UTC (rev 42761)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/display.cpp   2011-09-21 
21:36:00 UTC (rev 42762)
@@ -567,6 +567,7 @@
                                                                        // set 
up i2c gpio information for connector
                                                                        
radeon_gpu_i2c_setup(connector_index,
                                                                                
i2c_config->ucAccess);
+
                                                                        break;
                                                                case 
ATOM_HPD_INT_RECORD_TYPE:
                                                                        // TODO 
: HPD (Hot Plug)
@@ -704,10 +705,10 @@
                        ERROR("Connector #%" B_PRIu32 ")\n", id);
                        ERROR(" + connector:  %s\n", 
get_connector_name(connector_type));
                        ERROR(" + encoder:    %s\n", 
get_encoder_name(encoder_type));
+                       ERROR(" + i2c slave address:   0x%" B_PRIX8 "\n",
+                               gConnector[id]->connector_gpio.i2c_slave_addr);
                        ERROR(" + gpio valid: %s\n",
                                (gConnector[id]->connector_gpio.valid) ? "true" 
: "false");
-                       ERROR(" + gpio pin:   0x%" B_PRIX8 "\n",
-                               gConnector[id]->connector_gpio.pin);
                }
        }
        ERROR("==========================================\n");

Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.cpp       2011-09-20 
13:39:40 UTC (rev 42761)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.cpp       2011-09-21 
21:36:00 UTC (rev 42762)
@@ -344,7 +344,7 @@
        *_data = (sda != 0);
 
        //TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
-       //      __func__, info->pin, *_clock, *_data);
+       //      __func__, info->i2c_slave_addr, *_clock, *_data);
 
        return B_OK;
 }
@@ -367,7 +367,7 @@
        Write32(OUT, info->a_sda_reg, data);
 
        //TRACE("%s: GPIO 0x%" B_PRIX8 ", clock: %d, data: %d\n",
-       //      __func__, info->pin, clock, data);
+       //      __func__, info->i2c_slave_addr, clock, data);
 
        return B_OK;
 }
@@ -402,11 +402,11 @@
 
 
 status_t
-radeon_gpu_i2c_setup(uint32 id, uint8 gpio_pin)
+radeon_gpu_i2c_setup(uint32 id, uint8 i2c_slave_addr)
 {
        // aka radeon_lookup_i2c_gpio
-       TRACE("%s: Path #%" B_PRId32 ": GPIO Pin 0x%" B_PRIx8 "\n", __func__,
-               id, gpio_pin);
+       TRACE("%s: Path #%" B_PRId32 ": i2c slave: 0x%" B_PRIx8 "\n", __func__,
+               id, i2c_slave_addr);
 
        int index = GetIndexIntoMasterTable(DATA, GPIO_I2C_Info);
        uint8 frev;
@@ -434,7 +434,7 @@
                // TODO : if DCE 4 and i == 7 ... manual override for evergreen
                // TODO : if DCE 3 and i == 4 ... manual override
 
-               if (gpio->sucI2cId.ucAccess != gpio_pin)
+               if (gpio->sucI2cId.ucAccess != i2c_slave_addr)
                        continue;
 
                // populate gpio information
@@ -442,7 +442,8 @@
                gConnector[id]->connector_gpio.hw_capable
                        = (gpio->sucI2cId.sbfAccess.bfHW_Capable) ? true : 
false;
 
-               gConnector[id]->connector_gpio.pin = gpio_pin;
+               // slave address of i2c endpoint
+               gConnector[id]->connector_gpio.i2c_slave_addr = i2c_slave_addr;
 
                // GPIO mask (Allows software to control the GPIO pad)
                // 0 = chip access; 1 = only software;

Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.h 2011-09-20 13:39:40 UTC 
(rev 42761)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/gpu.h 2011-09-21 21:36:00 UTC 
(rev 42762)
@@ -169,7 +169,7 @@
 status_t radeon_gpu_mc_setup();
 status_t radeon_gpu_irq_setup();
 bool radeon_gpu_read_edid(uint32 connector, edid1_info *edid);
-status_t radeon_gpu_i2c_setup(uint32 id, uint8 gpio_pin);
+status_t radeon_gpu_i2c_setup(uint32 id, uint8 i2c_slave_addr);
 
 
 #endif

Other related posts:

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