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

* squash a *silly* bug

Browse Source 
don't set up a pointer and not malloc it.
* small cleanups to radeon_hd i2c bit-banging code
* i2c bit banging is now functioning


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42793 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-10-01 03:07:33 +00:00
parent 70b41cd671
commit ae347a6ce0
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/accelerant.h
+1 -1
View File
@@ -189,7 +189,7 @@ typedef struct {
uint32 hfreq_max; uint32 hfreq_max;
uint32 hfreq_min; uint32 hfreq_min;
pll_info pll; pll_info pll;
edid1_info *edid_info; edid1_info edid_info;
} display_info; } display_info;
src/add-ons/accelerants/radeon_hd/display.cpp
+1 -1
View File
@@ -629,7 +629,7 @@ detect_displays()
if (displayIndex >= MAX_DISPLAY) if (displayIndex >= MAX_DISPLAY)
continue; continue;
if (radeon_gpu_read_edid(id, gDisplay[displayIndex]->edid_info)) { if (radeon_gpu_read_edid(id, &gDisplay[displayIndex]->edid_info)) {
gDisplay[displayIndex]->active = true; gDisplay[displayIndex]->active = true;
// set this display as active // set this display as active
gDisplay[displayIndex]->connector_index = id; gDisplay[displayIndex]->connector_index = id;
src/add-ons/accelerants/radeon_hd/gpu.cpp
+4 -5
View File
@@ -334,10 +334,10 @@ get_i2c_signals(void* cookie, int* _clock, int* _data)
{ {
gpio_info *info = (gpio_info*)cookie; gpio_info *info = (gpio_info*)cookie;
uint32 scl = Read32(OUT, info->y_scl_reg); uint32 scl = Read32(OUT, info->y_scl_reg)
scl &= info->y_scl_mask; & info->y_scl_mask;
uint32 sda = Read32(OUT, info->y_sda_reg); uint32 sda = Read32(OUT, info->y_sda_reg)
sda &= info->y_sda_mask; & info->y_sda_mask;
*_clock = (scl != 0); *_clock = (scl != 0);
*_data = (sda != 0); *_data = (sda != 0);
@@ -378,7 +378,6 @@ radeon_gpu_read_edid(uint32 connector, edid1_info *edid)
i2c_bus bus; i2c_bus bus;
ddc2_init_timing(&bus); ddc2_init_timing(&bus);
//bus.cookie = (void*)&gConnector[connector]->connector_gpio;
bus.cookie = (void*)gGPIOInfo[gpio_id]; bus.cookie = (void*)gGPIOInfo[gpio_id];
bus.set_signals = &set_i2c_signals; bus.set_signals = &set_i2c_signals;
bus.get_signals = &get_i2c_signals; bus.get_signals = &get_i2c_signals;