From ae347a6ce03d5b6b6fab6b955a847db5ec4a6d53 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 1 Oct 2011 03:07:33 +0000
Subject: [PATCH] * squash a *silly* bug   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
---
 src/add-ons/accelerants/radeon_hd/accelerant.h | 2 +-
 src/add-ons/accelerants/radeon_hd/display.cpp  | 2 +-
 src/add-ons/accelerants/radeon_hd/gpu.cpp      | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/add-ons/accelerants/radeon_hd/accelerant.h b/src/add-ons/accelerants/radeon_hd/accelerant.h
index 6f228c4bc5..2fefc8a350 100644
--- a/src/add-ons/accelerants/radeon_hd/accelerant.h
+++ b/src/add-ons/accelerants/radeon_hd/accelerant.h
@@ -189,7 +189,7 @@ typedef struct {
 	uint32			hfreq_max;
 	uint32			hfreq_min;
 	pll_info		pll;
-	edid1_info		*edid_info;
+	edid1_info		edid_info;
 } display_info;
 
 
diff --git a/src/add-ons/accelerants/radeon_hd/display.cpp b/src/add-ons/accelerants/radeon_hd/display.cpp
index faaa8eb5a5..d82a0acdd1 100644
--- a/src/add-ons/accelerants/radeon_hd/display.cpp
+++ b/src/add-ons/accelerants/radeon_hd/display.cpp
@@ -629,7 +629,7 @@ detect_displays()
 		if (displayIndex >= MAX_DISPLAY)
 			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;
 				// set this display as active
 			gDisplay[displayIndex]->connector_index = id;
diff --git a/src/add-ons/accelerants/radeon_hd/gpu.cpp b/src/add-ons/accelerants/radeon_hd/gpu.cpp
index d54f2fca9d..0569af3a9a 100644
--- a/src/add-ons/accelerants/radeon_hd/gpu.cpp
+++ b/src/add-ons/accelerants/radeon_hd/gpu.cpp
@@ -334,10 +334,10 @@ get_i2c_signals(void* cookie, int* _clock, int* _data)
 {
 	gpio_info *info = (gpio_info*)cookie;
 
-	uint32 scl = Read32(OUT, info->y_scl_reg);
-	scl &= info->y_scl_mask;
-	uint32 sda = Read32(OUT, info->y_sda_reg);
-	sda &= info->y_sda_mask;
+	uint32 scl = Read32(OUT, info->y_scl_reg)
+		& info->y_scl_mask;
+	uint32 sda = Read32(OUT, info->y_sda_reg)
+		& info->y_sda_mask;
 
 	*_clock = (scl != 0);
 	*_data = (sda != 0);
@@ -378,7 +378,6 @@ radeon_gpu_read_edid(uint32 connector, edid1_info *edid)
 	i2c_bus bus;
 
 	ddc2_init_timing(&bus);
-	//bus.cookie = (void*)&gConnector[connector]->connector_gpio;
 	bus.cookie = (void*)gGPIOInfo[gpio_id];
 	bus.set_signals = &set_i2c_signals;
 	bus.get_signals = &get_i2c_signals;