drm/radeon/kms: make TV/DFP table info less verbose (40f76d81) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/drm/radeon/radeon_atombios.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1558,39 +1558,39 @@ radeon_atombios_get_tv_info(struct radeon_device *rdev)
	switch (tv_info->ucTV_BootUpDefaultStandard) {		switch (tv_info->ucTV_BootUpDefaultStandard) {
	case ATOM_TV_NTSC:		case ATOM_TV_NTSC:
	tv_std = TV_STD_NTSC;		tv_std = TV_STD_NTSC;
	DRM_INFO("Default TV standard: NTSC\n");		DRM_DEBUG_KMS("Default TV standard: NTSC\n");
	break;		break;
	case ATOM_TV_NTSCJ:		case ATOM_TV_NTSCJ:
	tv_std = TV_STD_NTSC_J;		tv_std = TV_STD_NTSC_J;
	DRM_INFO("Default TV standard: NTSC-J\n");		DRM_DEBUG_KMS("Default TV standard: NTSC-J\n");
	break;		break;
	case ATOM_TV_PAL:		case ATOM_TV_PAL:
	tv_std = TV_STD_PAL;		tv_std = TV_STD_PAL;
	DRM_INFO("Default TV standard: PAL\n");		DRM_DEBUG_KMS("Default TV standard: PAL\n");
	break;		break;
	case ATOM_TV_PALM:		case ATOM_TV_PALM:
	tv_std = TV_STD_PAL_M;		tv_std = TV_STD_PAL_M;
	DRM_INFO("Default TV standard: PAL-M\n");		DRM_DEBUG_KMS("Default TV standard: PAL-M\n");
	break;		break;
	case ATOM_TV_PALN:		case ATOM_TV_PALN:
	tv_std = TV_STD_PAL_N;		tv_std = TV_STD_PAL_N;
	DRM_INFO("Default TV standard: PAL-N\n");		DRM_DEBUG_KMS("Default TV standard: PAL-N\n");
	break;		break;
	case ATOM_TV_PALCN:		case ATOM_TV_PALCN:
	tv_std = TV_STD_PAL_CN;		tv_std = TV_STD_PAL_CN;
	DRM_INFO("Default TV standard: PAL-CN\n");		DRM_DEBUG_KMS("Default TV standard: PAL-CN\n");
	break;		break;
	case ATOM_TV_PAL60:		case ATOM_TV_PAL60:
	tv_std = TV_STD_PAL_60;		tv_std = TV_STD_PAL_60;
	DRM_INFO("Default TV standard: PAL-60\n");		DRM_DEBUG_KMS("Default TV standard: PAL-60\n");
	break;		break;
	case ATOM_TV_SECAM:		case ATOM_TV_SECAM:
	tv_std = TV_STD_SECAM;		tv_std = TV_STD_SECAM;
	DRM_INFO("Default TV standard: SECAM\n");		DRM_DEBUG_KMS("Default TV standard: SECAM\n");
	break;		break;
	default:		default:
	tv_std = TV_STD_NTSC;		tv_std = TV_STD_NTSC;
	DRM_INFO("Unknown TV standard; defaulting to NTSC\n");		DRM_DEBUG_KMS("Unknown TV standard; defaulting to NTSC\n");
	break;		break;
	}		}
	}		}

drivers/gpu/drm/radeon/radeon_combios.c

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -913,47 +913,47 @@ radeon_combios_get_tv_info(struct radeon_device *rdev)
	switch (RBIOS8(tv_info + 7) & 0xf) {		switch (RBIOS8(tv_info + 7) & 0xf) {
	case 1:		case 1:
	tv_std = TV_STD_NTSC;		tv_std = TV_STD_NTSC;
	DRM_INFO("Default TV standard: NTSC\n");		DRM_DEBUG_KMS("Default TV standard: NTSC\n");
	break;		break;
	case 2:		case 2:
	tv_std = TV_STD_PAL;		tv_std = TV_STD_PAL;
	DRM_INFO("Default TV standard: PAL\n");		DRM_DEBUG_KMS("Default TV standard: PAL\n");
	break;		break;
	case 3:		case 3:
	tv_std = TV_STD_PAL_M;		tv_std = TV_STD_PAL_M;
	DRM_INFO("Default TV standard: PAL-M\n");		DRM_DEBUG_KMS("Default TV standard: PAL-M\n");
	break;		break;
	case 4:		case 4:
	tv_std = TV_STD_PAL_60;		tv_std = TV_STD_PAL_60;
	DRM_INFO("Default TV standard: PAL-60\n");		DRM_DEBUG_KMS("Default TV standard: PAL-60\n");
	break;		break;
	case 5:		case 5:
	tv_std = TV_STD_NTSC_J;		tv_std = TV_STD_NTSC_J;
	DRM_INFO("Default TV standard: NTSC-J\n");		DRM_DEBUG_KMS("Default TV standard: NTSC-J\n");
	break;		break;
	case 6:		case 6:
	tv_std = TV_STD_SCART_PAL;		tv_std = TV_STD_SCART_PAL;
	DRM_INFO("Default TV standard: SCART-PAL\n");		DRM_DEBUG_KMS("Default TV standard: SCART-PAL\n");
	break;		break;
	default:		default:
	tv_std = TV_STD_NTSC;		tv_std = TV_STD_NTSC;
	DRM_INFO		DRM_DEBUG_KMS
	("Unknown TV standard; defaulting to NTSC\n");		("Unknown TV standard; defaulting to NTSC\n");
	break;		break;
	}		}

	switch ((RBIOS8(tv_info + 9) >> 2) & 0x3) {		switch ((RBIOS8(tv_info + 9) >> 2) & 0x3) {
	case 0:		case 0:
	DRM_INFO("29.498928713 MHz TV ref clk\n");		DRM_DEBUG_KMS("29.498928713 MHz TV ref clk\n");
	break;		break;
	case 1:		case 1:
	DRM_INFO("28.636360000 MHz TV ref clk\n");		DRM_DEBUG_KMS("28.636360000 MHz TV ref clk\n");
	break;		break;
	case 2:		case 2:
	DRM_INFO("14.318180000 MHz TV ref clk\n");		DRM_DEBUG_KMS("14.318180000 MHz TV ref clk\n");
	break;		break;
	case 3:		case 3:
	DRM_INFO("27.000000000 MHz TV ref clk\n");		DRM_DEBUG_KMS("27.000000000 MHz TV ref clk\n");
	break;		break;
	default:		default:
	break;		break;
	@@ -1324,7 +1324,7 @@ bool radeon_legacy_get_tmds_info_from_combios(struct radeon_encoder *encoder,

	if (tmds_info) {		if (tmds_info) {
	ver = RBIOS8(tmds_info);		ver = RBIOS8(tmds_info);
	DRM_INFO("DFP table revision: %d\n", ver);		DRM_DEBUG_KMS("DFP table revision: %d\n", ver);
	if (ver == 3) {		if (ver == 3) {
	n = RBIOS8(tmds_info + 5) + 1;		n = RBIOS8(tmds_info + 5) + 1;
	if (n > 4)		if (n > 4)
	@@ -1408,7 +1408,7 @@ bool radeon_legacy_get_ext_tmds_info_from_combios(struct radeon_encoder *encoder
	offset = combios_get_table_offset(dev, COMBIOS_EXT_TMDS_INFO_TABLE);		offset = combios_get_table_offset(dev, COMBIOS_EXT_TMDS_INFO_TABLE);
	if (offset) {		if (offset) {
	ver = RBIOS8(offset);		ver = RBIOS8(offset);
	DRM_INFO("External TMDS Table revision: %d\n", ver);		DRM_DEBUG_KMS("External TMDS Table revision: %d\n", ver);
	tmds->slave_addr = RBIOS8(offset + 4 + 2);		tmds->slave_addr = RBIOS8(offset + 4 + 2);
	tmds->slave_addr >>= 1; /* 7 bit addressing */		tmds->slave_addr >>= 1; /* 7 bit addressing */
	gpio = RBIOS8(offset + 4 + 3);		gpio = RBIOS8(offset + 4 + 3);