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

 		radeon_router_select_ddc_port(radeon_connector);
 	if (use_aux) {
 		ret = i2c_transfer(&radeon_connector->ddc_bus->aux.ddc, msgs, 2);
 	} else {
-	ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
+		ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
+	}
 	if (ret != 2)
 		/* Couldn't find an accessible DDC on this connector */
 		return false;
-		/* Probe also for valid EDID header
+	/* Probe also for valid EDID header
-		 * EDID header starts with:
+	 * EDID header starts with:
-		 * 0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00.
+	 * 0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00.
-		 * Only the first 6 bytes must be valid as
+	 * Only the first 6 bytes must be valid as
-		 * drm_edid_block_valid() can fix the last 2 bytes */
+	 * drm_edid_block_valid() can fix the last 2 bytes */
-		if (drm_edid_header_is_valid(buf) < 6) {
+	if (drm_edid_header_is_valid(buf) < 6) {
-			/* Couldn't find an accessible EDID on this
+		/* Couldn't find an accessible EDID on this
-			 * connector */
+		 * connector */
-			return false;
+		return false;
+	}
-		return true;
+	return true;
+}
 	/* RV410 appears to have a bug where the hw i2c in reset
 	 * holds the i2c port in a bad state - switch hw i2c away before
 	 * doing DDC - do this for all r200s/r300s/r400s for safety sake
 	 */
 	if (rec->hw_capable) {
-	if ((rdev->family >= CHIP_R200) && !ASIC_IS_AVIVO(rdev)) {
+		if ((rdev->family >= CHIP_R200) && !ASIC_IS_AVIVO(rdev)) {
 			u32 reg;
 			if (rdev->family >= CHIP_RV350)
 				reg = RADEON_GPIO_MONID;
 			else
 				reg = RADEON_GPIO_CRT2_DDC;
 			mutex_lock(&rdev->dc_hw_i2c_mutex);
 			if (rec->a_clk_reg == reg) {
-			WREG32(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
+				WREG32(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
-						R200_DVI_I2C_PIN_SEL(R200_SEL_DDC1)));
+							       R200_DVI_I2C_PIN_SEL(R200_SEL_DDC1)));
-		} else {
+			} else {
-			WREG32(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
+				WREG32(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
-						R200_DVI_I2C_PIN_SEL(R200_SEL_DDC3)));
+							       R200_DVI_I2C_PIN_SEL(R200_SEL_DDC3)));
+			}
 			mutex_unlock(&rdev->dc_hw_i2c_mutex);
+		}
+	}
 	/* switch the pads to ddc mode */
 		WREG32(rec->mask_clk_reg, temp);
+	}
 	/* clear the output pin values */
 	temp = RREG32(rec->a_clk_reg) & ~rec->a_clk_mask;
-		WREG32(rec->a_clk_reg, temp);
+	WREG32(rec->a_clk_reg, temp);
 	temp = RREG32(rec->a_data_reg) & ~rec->a_data_mask;
-		WREG32(rec->a_data_reg, temp);
+	WREG32(rec->a_data_reg, temp);
 	case CHIP_R420:
 	case CHIP_R423:
 	case CHIP_RV410:
 	case CHIP_RS400:
 	case CHIP_RS480:
-			ret = r100_hw_i2c_xfer(i2c_adap, msgs, num);
+		ret = r100_hw_i2c_xfer(i2c_adap, msgs, num);
 		break;
 	case CHIP_RS600:
 	case CHIP_RS690:
 	case CHIP_RS740:
 		/* XXX fill in hw i2c implementation */
 	case CHIP_R520:
 	case CHIP_RV530:
 	case CHIP_RV560:
 	case CHIP_RV570:
 	case CHIP_R580:
-			if (rec->mm_i2c)
+		if (rec->mm_i2c)
-				ret = r100_hw_i2c_xfer(i2c_adap, msgs, num);
+			ret = r100_hw_i2c_xfer(i2c_adap, msgs, num);
-			else
+		else
-				ret = r500_hw_i2c_xfer(i2c_adap, msgs, num);
+			ret = r500_hw_i2c_xfer(i2c_adap, msgs, num);
 		break;
 	case CHIP_R600:
 	case CHIP_RV610:
 	case CHIP_RV630:
 	case CHIP_RV670:
 	.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,
+					  struct radeon_i2c_bus_rec *rec,
-		const char *name)
+					  const char *name)
+{
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_i2c_chan *i2c;
 		return NULL;
 	i2c->rec = *rec;
 	i2c->adapter.owner = THIS_MODULE;
+	i2c->adapter.class = I2C_CLASS_DDC;
-	i2c->adapter.class = I2C_CLASS_DDC;
+	i2c->adapter.dev.parent = &dev->pdev->dev;
 	i2c->dev = dev;
 	i2c_set_adapdata(&i2c->adapter, i2c);
 	mutex_init(&i2c->mutex);
 	if (rec->mm_i2c ||
 		i2c->bit.getscl = get_clock;
 		i2c->bit.udelay = 10;
 		i2c->bit.timeout = usecs_to_jiffies(2200);	/* from VESA */
 		i2c->bit.data = i2c;
 		ret = i2c_bit_add_bus(&i2c->adapter);
-	if (ret) {
+		if (ret) {
 			DRM_ERROR("Failed to register bit i2c %s\n", name);
-		goto out_free;
+			goto out_free;
-	}
+		}
+	}
 	return i2c;
 out_free:
+		}
+	}
 	return NULL;
+}
-struct drm_encoder *radeon_best_encoder(struct drm_connector *connector)
-{
-	return NULL;
-}
 void radeon_i2c_get_byte(struct radeon_i2c_chan *i2c_bus,
-			    u8 slave_addr,
+			 u8 slave_addr,
-			    u8 addr,
+			 u8 addr,
-			    u8 *val)
+			 u8 *val)
+{
 	u8 out_buf[2];
 	u8 in_buf[2];
 	struct i2c_msg msgs[] = {
 			  addr, *val);
+	}
+}
 void radeon_i2c_put_byte(struct radeon_i2c_chan *i2c_bus,
-			    u8 slave_addr,
+			 u8 slave_addr,
-			    u8 addr,
+			 u8 addr,
-			    u8 val)
+			 u8 val)
+{
 	uint8_t out_buf[2];
 	struct i2c_msg msg = {
 		.addr = slave_addr,
 /* ddc router switching */
 void radeon_router_select_ddc_port(struct radeon_connector *radeon_connector)
+{
 	u8 val;
-    if (!radeon_connector->router.ddc_valid)
+	if (!radeon_connector->router.ddc_valid)
 		return;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_i2c.c – Rev 5078 → 6104