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

 x01080000,		/* rv410 */
 x00780000,		/* rs400 */
 x00780000,		/* rs480 */
 };
-static struct radeon_encoder_tv_dac
+static void radeon_legacy_get_tv_dac_info_from_table(struct radeon_device *rdev,
-    *radeon_legacy_get_tv_dac_info_from_table(struct radeon_device *rdev)
+						     struct radeon_encoder_tv_dac *tv_dac)
-{
-	struct radeon_encoder_tv_dac *tv_dac = NULL;
-	tv_dac = kzalloc(sizeof(struct radeon_encoder_tv_dac), GFP_KERNEL);
-	if (!tv_dac)
-		return NULL;
+{
 	tv_dac->ps2_tvdac_adj = default_tvdac_adj[rdev->family];
 	if ((rdev->flags & RADEON_IS_MOBILITY) && (rdev->family == CHIP_RV250))
 		tv_dac->ps2_tvdac_adj = 0x00880000;
 	tv_dac->pal_tvdac_adj = tv_dac->ps2_tvdac_adj;
-	tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
+	tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
-	return tv_dac;
+	return;
+}
 struct radeon_encoder_tv_dac *radeon_combios_get_tv_dac_info(struct
 	struct drm_device *dev = encoder->base.dev;
 	struct radeon_device *rdev = dev->dev_private;
 	uint16_t dac_info;
 	uint8_t rev, bg, dac;
 	struct radeon_encoder_tv_dac *tv_dac = NULL;
+	int found = 0;
+	tv_dac = kzalloc(sizeof(struct radeon_encoder_tv_dac), GFP_KERNEL);
+	if (!tv_dac)
+		return NULL;
 	if (rdev->bios == NULL)
-		return radeon_legacy_get_tv_dac_info_from_table(rdev);
+		goto out;
 	/* first check TV table */
-	dac_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE);
-	if (dac_info) {
-		tv_dac =
-		    kzalloc(sizeof(struct radeon_encoder_tv_dac), GFP_KERNEL);
-		if (!tv_dac)
-			return NULL;
+	dac_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE);
 	if (dac_info) {
 		rev = RBIOS8(dac_info + 0x3);
 		if (rev > 4) {
 			bg = RBIOS8(dac_info + 0xc) & 0xf;
 			tv_dac->pal_tvdac_adj = (bg << 16) | (dac << 20);
 			bg = RBIOS8(dac_info + 0x10) & 0xf;
 			dac = RBIOS8(dac_info + 0x11) & 0xf;
+			tv_dac->ntsc_tvdac_adj = (bg << 16) | (dac << 20);
-			tv_dac->ntsc_tvdac_adj = (bg << 16) | (dac << 20);
+			found = 1;
 		} else if (rev > 1) {
 			bg = RBIOS8(dac_info + 0xc) & 0xf;
 			dac = (RBIOS8(dac_info + 0xc) >> 4) & 0xf;
 			tv_dac->pal_tvdac_adj = (bg << 16) | (dac << 20);
 			bg = RBIOS8(dac_info + 0xe) & 0xf;
 			dac = (RBIOS8(dac_info + 0xe) >> 4) & 0xf;
+			tv_dac->ntsc_tvdac_adj = (bg << 16) | (dac << 20);
-			tv_dac->ntsc_tvdac_adj = (bg << 16) | (dac << 20);
+			found = 1;
+		}
 		tv_dac->tv_std = radeon_combios_get_tv_info(encoder);
+	}
-	} else {
+	if (!found) {
 		/* then check CRT table */
 		dac_info =
-		    combios_get_table_offset(dev, COMBIOS_CRT_INFO_TABLE);
-		if (dac_info) {
-			tv_dac =
-			    kzalloc(sizeof(struct radeon_encoder_tv_dac),
-				    GFP_KERNEL);
-			if (!tv_dac)
-				return NULL;
+		    combios_get_table_offset(dev, COMBIOS_CRT_INFO_TABLE);
 		if (dac_info) {
 			rev = RBIOS8(dac_info) & 0x3;
 			if (rev < 2) {
 				bg = RBIOS8(dac_info + 0x3) & 0xf;
 				dac = (RBIOS8(dac_info + 0x3) >> 4) & 0xf;
 				tv_dac->ps2_tvdac_adj =
 				    (bg << 16) | (dac << 20);
+				tv_dac->pal_tvdac_adj = tv_dac->ps2_tvdac_adj;
-				tv_dac->pal_tvdac_adj = tv_dac->ps2_tvdac_adj;
+				tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
-				tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
+				found = 1;
 			} else {
 				bg = RBIOS8(dac_info + 0x4) & 0xf;
 				dac = RBIOS8(dac_info + 0x5) & 0xf;
 				tv_dac->ps2_tvdac_adj =
 				    (bg << 16) | (dac << 20);
+				tv_dac->pal_tvdac_adj = tv_dac->ps2_tvdac_adj;
-				tv_dac->pal_tvdac_adj = tv_dac->ps2_tvdac_adj;
+				tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
-				tv_dac->ntsc_tvdac_adj = tv_dac->ps2_tvdac_adj;
+				found = 1;
+			}
-		} else {
-			DRM_INFO("No TV DAC info found in BIOS\n");
+		} else {
-			return radeon_legacy_get_tv_dac_info_from_table(rdev);
+			DRM_INFO("No TV DAC info found in BIOS\n");
+		}
+	}
+out:
 	if (!found) /* fallback to defaults */
 		radeon_legacy_get_tv_dac_info_from_table(rdev, tv_dac);
 	uint32_t panel_setup;
 	char stmp[30];
 	int tmp, i;
 	struct radeon_encoder_lvds *lvds = NULL;
-	if (rdev->bios == NULL)
+	if (rdev->bios == NULL) {
+		lvds = radeon_legacy_get_lvds_info_from_regs(rdev);
+		goto out;
 		return radeon_legacy_get_lvds_info_from_regs(rdev);
 	lcd_info = combios_get_table_offset(dev, COMBIOS_LCD_INFO_TABLE);
 				lvds->native_mode.dotclock =
 				    RBIOS16(tmp + 9) * 10;
 				lvds->native_mode.flags = 0;
+			}
+		}
-		encoder->native_mode = lvds->native_mode;
 	} else {
 		DRM_INFO("No panel info found in BIOS\n");
-		return radeon_legacy_get_lvds_info_from_regs(rdev);
+		lvds = radeon_legacy_get_lvds_info_from_regs(rdev);
+	}
+out:
+	if (lvds)
+		encoder->native_mode = lvds->native_mode;
 	return lvds;
+}
 static const struct radeon_tmds_pll default_tmds_pll[CHIP_LAST][4] = {
 	{{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}},	/* CHIP_RV410 */
 	{{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},	/* CHIP_RS400 */
 	{{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},	/* CHIP_RS480 */
 };
-static struct radeon_encoder_int_tmds
+bool radeon_legacy_get_tmds_info_from_table(struct radeon_encoder *encoder,
-    *radeon_legacy_get_tmds_info_from_table(struct radeon_device *rdev)
+					    struct radeon_encoder_int_tmds *tmds)
+{
+	struct drm_device *dev = encoder->base.dev;
 	struct radeon_device *rdev = dev->dev_private;
-	int i;
-	struct radeon_encoder_int_tmds *tmds = NULL;
-	tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
-	if (!tmds)
-		return NULL;
+	int i;
 	for (i = 0; i < 4; i++) {
 		tmds->tmds_pll[i].value =
 		    default_tmds_pll[rdev->family][i].value;
 		tmds->tmds_pll[i].freq = default_tmds_pll[rdev->family][i].freq;
+	}
-	return tmds;
+	return true;
-}
+}
 struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct
-							     radeon_encoder
+bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,
-							     *encoder)
+					      struct radeon_encoder_int_tmds *tmds)
+{
 	struct drm_device *dev = encoder->base.dev;
-	struct radeon_device *rdev = dev->dev_private;
-	uint16_t tmds_info;
+	struct radeon_device *rdev = dev->dev_private;
-	int i, n;
+	uint16_t tmds_info;
-	uint8_t ver;
+	int i, n;
-	struct radeon_encoder_int_tmds *tmds = NULL;
+	uint8_t ver;
-	if (rdev->bios == NULL)
-		return radeon_legacy_get_tmds_info_from_table(rdev);
-	tmds_info = combios_get_table_offset(dev, COMBIOS_DFP_INFO_TABLE);
-	if (tmds_info) {
+	if (rdev->bios == NULL)
-		tmds =
+		return false;
 		    kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
 					  tmds->tmds_pll[i].value);
+			}
+		}
 	} else
 		DRM_INFO("No TMDS info found in BIOS\n");
+	return true;
+}
+struct radeon_encoder_int_tmds *radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
+{
+	struct radeon_encoder_int_tmds *tmds = NULL;
+	bool ret;
+	tmds = kzalloc(sizeof(struct radeon_encoder_int_tmds), GFP_KERNEL);
+	if (!tmds)
+		return NULL;
+	ret = radeon_legacy_get_tmds_info_from_combios(encoder, tmds);
+	if (ret == false)
+		radeon_legacy_get_tmds_info_from_table(encoder, tmds);
 	return tmds;
+}
 void radeon_combios_get_ext_tmds_info(struct radeon_encoder *encoder)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_combios.c – Rev 1123 → 1179