WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_i2c.c

  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Dave Airlie
  *          Alex Deucher
  */
+#include
-#include "drmP.h"
+#include
+#include
-#include "radeon_drm.h"
+#include
 #include "radeon.h"
 #include "atom.h"
+extern int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
+				   struct i2c_msg *msgs, int num);
+extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
 /**
  * radeon_ddc_probe
+ *
  */
-bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool requires_extended_probe)
+bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
+{
 	u8 out = 0x0;
 	u8 buf[8];
 	int ret;
 	struct i2c_msg msgs[] = {
 		{
-			.addr = 0x50,
+			.addr = DDC_ADDR,
 			.flags = 0,
 			.len = 1,
 			.buf = &out,
 		},
 		{
-			.addr = 0x50,
+			.addr = DDC_ADDR,
 			.flags = I2C_M_RD,
-			.len = 1,
+			.len = 8,
 			.buf = buf,
+		}
-	};
-	/* Read 8 bytes from i2c for extended probe of EDID header */
-	if (requires_extended_probe)
-		msgs[1].len = 8;
+	};
 	/* on hw with routers, select right port */
 	if (radeon_connector->router.ddc_valid)
 		radeon_router_select_ddc_port(radeon_connector);
 	ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
-	if (ret != 2)
-		/* Couldn't find an accessible DDC on this connector */
+	if (ret != 2)
-		return false;
+		/* Couldn't find an accessible DDC on this connector */
-	if (requires_extended_probe) {
+		return false;
 		/* Probe also for valid EDID header
 		 * EDID header starts with:
 		 * 0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00.
 		 * Only the first 6 bytes must be valid as
 		 * drm_edid_block_valid() can fix the last 2 bytes */
 		if (drm_edid_header_is_valid(buf) < 6) {
 			/* Couldn't find an accessible EDID on this
-			 * connector */
-			return false;
+			 * connector */
 			return false;
+		}
 		return true;
+}
 /* bit banging i2c */
 /* bit banging i2c */
 static int pre_xfer(struct i2c_adapter *i2c_adap)
 static void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state)
 	temp = RREG32(rec->en_data_reg) & ~rec->en_data_mask;
 	WREG32(rec->en_data_reg, temp);
-	/* mask the gpio pins for software use */
-	temp = RREG32(rec->mask_clk_reg);
-	if (lock_state)
-		temp |= rec->mask_clk_mask;
-	else
+	/* mask the gpio pins for software use */
-		temp &= ~rec->mask_clk_mask;
+	temp = RREG32(rec->mask_clk_reg) | rec->mask_clk_mask;
+	WREG32(rec->mask_clk_reg, temp);
+	temp = RREG32(rec->mask_clk_reg);
 	WREG32(rec->mask_clk_reg, temp);
+	temp = RREG32(rec->mask_data_reg) | rec->mask_data_mask;
+	WREG32(rec->mask_data_reg, temp);
+	temp = RREG32(rec->mask_data_reg);
+	return 0;
+}
+static void post_xfer(struct i2c_adapter *i2c_adap)
+{
-	temp = RREG32(rec->mask_clk_reg);
+	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
+	struct radeon_device *rdev = i2c->dev->dev_private;
+	struct radeon_i2c_bus_rec *rec = &i2c->rec;
+	uint32_t temp;
+	/* unmask the gpio pins for software use */
-	temp = RREG32(rec->mask_data_reg);
+	temp = RREG32(rec->mask_clk_reg) & ~rec->mask_clk_mask;
-	if (lock_state)
+	WREG32(rec->mask_clk_reg, temp);
-		temp |= rec->mask_data_mask;
+	temp = RREG32(rec->mask_clk_reg);
 	else
-		temp &= ~rec->mask_data_mask;
+	temp = RREG32(rec->mask_data_reg) & ~rec->mask_data_mask;
 	WREG32(rec->mask_data_reg, temp);
 	val = RREG32(rec->en_data_reg) & ~rec->en_data_mask;
 	val |= data ? 0 : rec->en_data_mask;
 	WREG32(rec->en_data_reg, val);
+}
-static int pre_xfer(struct i2c_adapter *i2c_adap)
-{
-	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
-	radeon_i2c_do_lock(i2c, 1);
-	return 0;
-}
-static void post_xfer(struct i2c_adapter *i2c_adap)
-{
-	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);
-	radeon_i2c_do_lock(i2c, 0);
-}
 /* hw i2c */
 static u32 radeon_get_i2c_prescale(struct radeon_device *rdev)
 static const struct i2c_algorithm radeon_i2c_algo = {
 	.master_xfer = radeon_hw_i2c_xfer,
 	.functionality = radeon_hw_i2c_func,
 };
+static const struct i2c_algorithm radeon_atom_i2c_algo = {
+	.master_xfer = radeon_atom_hw_i2c_xfer,
+	.functionality = radeon_atom_hw_i2c_func,
+};
 struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
 		struct radeon_i2c_bus_rec *rec,
 		const char *name)
+{
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_i2c_chan *i2c;
+	int ret;
+	/* don't add the mm_i2c bus unless hw_i2c is enabled */
+	if (rec->mm_i2c && (radeon_hw_i2c == 0))
-	int ret;
+		return NULL;
 	i2c = kzalloc(sizeof(struct radeon_i2c_chan), GFP_KERNEL);
 	if (i2c == NULL)
 		return NULL;
 	i2c->rec = *rec;
-	i2c->rec = *rec;
+	i2c->adapter.owner = THIS_MODULE;
-//   i2c->adapter.owner = THIS_MODULE;
+	i2c->adapter.class = I2C_CLASS_DDC;
 	i2c->dev = dev;
 	i2c_set_adapdata(&i2c->adapter, i2c);
-//        ret = i2c_add_adapter(&i2c->adapter);
+//		ret = i2c_add_adapter(&i2c->adapter);
-//        if (ret) {
+//		if (ret) {
-//           DRM_ERROR("Failed to register hw i2c %s\n", name);
+//			DRM_ERROR("Failed to register hw i2c %s\n", name);
-//           goto out_free;
+//			goto out_free;
-//       }
+//		}
+	} else if (rec->hw_capable &&
+		   radeon_hw_i2c &&
+		   ASIC_IS_DCE3(rdev)) {
+		/* hw i2c using atom */
+		snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
+			 "Radeon i2c hw bus %s", name);
+		i2c->adapter.algo = &radeon_atom_i2c_algo;
+//		ret = i2c_add_adapter(&i2c->adapter);
+//		if (ret) {
+//			DRM_ERROR("Failed to register hw i2c %s\n", name);
+//			goto out_free;
+//		}
 	} else {
 		/* set the radeon bit adapter */
 		snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
 			 "Radeon i2c bit bus %s", name);
 		i2c->adapter.algo_data = &i2c->algo.bit;
 		i2c->algo.bit.post_xfer = post_xfer;
 		i2c->algo.bit.setsda = set_data;
 		i2c->algo.bit.setscl = set_clock;
 		i2c->algo.bit.getsda = get_data;
 		i2c->algo.bit.getscl = get_clock;
-		i2c->algo.bit.udelay = 20;
+		i2c->algo.bit.udelay = 10;
-	/* vesa says 2.2 ms is enough, 1 jiffy doesn't seem to always
-	 * make this, 2 jiffies is a lot more reliable */
-		i2c->algo.bit.timeout = 2;
+		i2c->algo.bit.timeout = usecs_to_jiffies(2200);	/* from VESA */
 		i2c->algo.bit.data = i2c;
 		ret = i2c_bit_add_bus(&i2c->adapter);
 	if (ret) {
 			DRM_ERROR("Failed to register bit i2c %s\n", name);
 		goto out_free;
 	i2c = kzalloc(sizeof(struct radeon_i2c_chan), GFP_KERNEL);
 	if (i2c == NULL)
 		return NULL;
 	i2c->rec = *rec;
-//   i2c->adapter.owner = THIS_MODULE;
+	i2c->adapter.owner = THIS_MODULE;
 	i2c->adapter.class = I2C_CLASS_DDC;
 	i2c->dev = dev;
 	snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
 		 "Radeon aux bus %s", name);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_i2c.c – Rev 2160 → 2997