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



 
			drm_object_attach_property(&radeon_connector->base.base,
						   rdev->mode_info.dither_property,

						   RADEON_FMT_DITHER_DISABLE);
 
			if (radeon_audio != 0) {
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.audio_property,
							   RADEON_AUDIO_AUTO);
				radeon_connector->audio = RADEON_AUDIO_AUTO;
			}
			if (ASIC_IS_DCE5(rdev))
				drm_object_attach_property(&radeon_connector->base.base,

				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.output_csc_property,
							   RADEON_OUTPUT_CSC_BYPASS);
			/* no HPD on analog connectors */
			radeon_connector->hpd.hpd = RADEON_HPD_NONE;
 
			connector->interlace_allowed = true;
			connector->doublescan_allowed = true;
			break;
		case DRM_MODE_CONNECTOR_DVIA:
			drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

			}
			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.audio_property,
							   RADEON_AUDIO_AUTO);
				radeon_connector->audio = RADEON_AUDIO_AUTO;
			}
			if (connector_type == DRM_MODE_CONNECTOR_DVII) {
				radeon_connector->dac_load_detect = true;
				drm_object_attach_property(&radeon_connector->base.base,
							      rdev->mode_info.load_detect_property,

			}
			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.audio_property,
							   RADEON_AUDIO_AUTO);
				radeon_connector->audio = RADEON_AUDIO_AUTO;
			}
			if (ASIC_IS_DCE5(rdev))
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.output_csc_property,
							   RADEON_OUTPUT_CSC_BYPASS);

			}
			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.audio_property,
							   RADEON_AUDIO_AUTO);
				radeon_connector->audio = RADEON_AUDIO_AUTO;
			}
			if (ASIC_IS_DCE5(rdev))
				drm_object_attach_property(&radeon_connector->base.base,
							   rdev->mode_info.output_csc_property,
							   RADEON_OUTPUT_CSC_BYPASS);

			break;
		}
	}

 
	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
		if (i2c_bus->valid) {
			connector->polled = DRM_CONNECTOR_POLL_CONNECT |
			                    DRM_CONNECTOR_POLL_DISCONNECT;
		}
	} else

		connector->polled = DRM_CONNECTOR_POLL_HPD;
 

		drm_object_attach_property(&radeon_connector->base.base,
					      rdev->mode_info.load_detect_property,
					      1);
		/* no HPD on analog connectors */
		radeon_connector->hpd.hpd = RADEON_HPD_NONE;
 
		connector->interlace_allowed = true;
		connector->doublescan_allowed = true;
		break;
	case DRM_MODE_CONNECTOR_DVIA:
		drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

		connector->doublescan_allowed = false;
		break;
	}

 
	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
		if (i2c_bus->valid) {
			connector->polled = DRM_CONNECTOR_POLL_CONNECT |
			                    DRM_CONNECTOR_POLL_DISCONNECT;
		}
	} else
		connector->polled = DRM_CONNECTOR_POLL_HPD;
 
	connector->display_info.subpixel_order = subpixel_order;
	drm_connector_register(connector);

}

Rev 6321	Rev 6661
Line 1966...	Line 1966...
1966		1966
1967	drm_object_attach_property(&radeon_connector->base.base,	1967	drm_object_attach_property(&radeon_connector->base.base,
1968	rdev->mode_info.dither_property,	1968	rdev->mode_info.dither_property,
Line 1969...	Line 1969...
1969	RADEON_FMT_DITHER_DISABLE);	1969	RADEON_FMT_DITHER_DISABLE);
1970		1970
1971	if (radeon_audio != 0)	1971	if (radeon_audio != 0) {
1972	drm_object_attach_property(&radeon_connector->base.base,	1972	drm_object_attach_property(&radeon_connector->base.base,
-		1973	rdev->mode_info.audio_property,
-		1974	RADEON_AUDIO_AUTO);
1973	rdev->mode_info.audio_property,	1975	radeon_connector->audio = RADEON_AUDIO_AUTO;
1974	RADEON_AUDIO_AUTO);	1976	}
1975	if (ASIC_IS_DCE5(rdev))	1977	if (ASIC_IS_DCE5(rdev))
1976	drm_object_attach_property(&radeon_connector->base.base,	1978	drm_object_attach_property(&radeon_connector->base.base,
Line 2026...	Line 2028...
2026	drm_object_attach_property(&radeon_connector->base.base,	2028	drm_object_attach_property(&radeon_connector->base.base,
2027	rdev->mode_info.output_csc_property,	2029	rdev->mode_info.output_csc_property,
2028	RADEON_OUTPUT_CSC_BYPASS);	2030	RADEON_OUTPUT_CSC_BYPASS);
2029	/* no HPD on analog connectors */	2031	/* no HPD on analog connectors */
2030	radeon_connector->hpd.hpd = RADEON_HPD_NONE;	2032	radeon_connector->hpd.hpd = RADEON_HPD_NONE;
2031	connector->polled = DRM_CONNECTOR_POLL_CONNECT;	-
2032	connector->interlace_allowed = true;	2033	connector->interlace_allowed = true;
2033	connector->doublescan_allowed = true;	2034	connector->doublescan_allowed = true;
2034	break;	2035	break;
2035	case DRM_MODE_CONNECTOR_DVIA:	2036	case DRM_MODE_CONNECTOR_DVIA:
2036	drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);	2037	drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
Line 2094...	Line 2095...
2094	}	2095	}
2095	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {	2096	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
2096	drm_object_attach_property(&radeon_connector->base.base,	2097	drm_object_attach_property(&radeon_connector->base.base,
2097	rdev->mode_info.audio_property,	2098	rdev->mode_info.audio_property,
2098	RADEON_AUDIO_AUTO);	2099	RADEON_AUDIO_AUTO);
-		2100	radeon_connector->audio = RADEON_AUDIO_AUTO;
2099	}	2101	}
2100	if (connector_type == DRM_MODE_CONNECTOR_DVII) {	2102	if (connector_type == DRM_MODE_CONNECTOR_DVII) {
2101	radeon_connector->dac_load_detect = true;	2103	radeon_connector->dac_load_detect = true;
2102	drm_object_attach_property(&radeon_connector->base.base,	2104	drm_object_attach_property(&radeon_connector->base.base,
2103	rdev->mode_info.load_detect_property,	2105	rdev->mode_info.load_detect_property,
Line 2149...	Line 2151...
2149	}	2151	}
2150	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {	2152	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
2151	drm_object_attach_property(&radeon_connector->base.base,	2153	drm_object_attach_property(&radeon_connector->base.base,
2152	rdev->mode_info.audio_property,	2154	rdev->mode_info.audio_property,
2153	RADEON_AUDIO_AUTO);	2155	RADEON_AUDIO_AUTO);
-		2156	radeon_connector->audio = RADEON_AUDIO_AUTO;
2154	}	2157	}
2155	if (ASIC_IS_DCE5(rdev))	2158	if (ASIC_IS_DCE5(rdev))
2156	drm_object_attach_property(&radeon_connector->base.base,	2159	drm_object_attach_property(&radeon_connector->base.base,
2157	rdev->mode_info.output_csc_property,	2160	rdev->mode_info.output_csc_property,
2158	RADEON_OUTPUT_CSC_BYPASS);	2161	RADEON_OUTPUT_CSC_BYPASS);
Line 2201...	Line 2204...
2201	}	2204	}
2202	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {	2205	if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
2203	drm_object_attach_property(&radeon_connector->base.base,	2206	drm_object_attach_property(&radeon_connector->base.base,
2204	rdev->mode_info.audio_property,	2207	rdev->mode_info.audio_property,
2205	RADEON_AUDIO_AUTO);	2208	RADEON_AUDIO_AUTO);
-		2209	radeon_connector->audio = RADEON_AUDIO_AUTO;
2206	}	2210	}
2207	if (ASIC_IS_DCE5(rdev))	2211	if (ASIC_IS_DCE5(rdev))
2208	drm_object_attach_property(&radeon_connector->base.base,	2212	drm_object_attach_property(&radeon_connector->base.base,
2209	rdev->mode_info.output_csc_property,	2213	rdev->mode_info.output_csc_property,
2210	RADEON_OUTPUT_CSC_BYPASS);	2214	RADEON_OUTPUT_CSC_BYPASS);
Line 2273...	Line 2277...
2273	break;	2277	break;
2274	}	2278	}
2275	}	2279	}
Line 2276...	Line 2280...
2276		2280
2277	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {	2281	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
2278	if (i2c_bus->valid)	2282	if (i2c_bus->valid) {
-		2283	connector->polled = DRM_CONNECTOR_POLL_CONNECT \|
-		2284	DRM_CONNECTOR_POLL_DISCONNECT;
2279	connector->polled = DRM_CONNECTOR_POLL_CONNECT;	2285	}
2280	} else	2286	} else
Line 2281...	Line 2287...
2281	connector->polled = DRM_CONNECTOR_POLL_HPD;	2287	connector->polled = DRM_CONNECTOR_POLL_HPD;
2282		2288
Line 2350...	Line 2356...
2350	drm_object_attach_property(&radeon_connector->base.base,	2356	drm_object_attach_property(&radeon_connector->base.base,
2351	rdev->mode_info.load_detect_property,	2357	rdev->mode_info.load_detect_property,
2352	1);	2358	1);
2353	/* no HPD on analog connectors */	2359	/* no HPD on analog connectors */
2354	radeon_connector->hpd.hpd = RADEON_HPD_NONE;	2360	radeon_connector->hpd.hpd = RADEON_HPD_NONE;
2355	connector->polled = DRM_CONNECTOR_POLL_CONNECT;	-
2356	connector->interlace_allowed = true;	2361	connector->interlace_allowed = true;
2357	connector->doublescan_allowed = true;	2362	connector->doublescan_allowed = true;
2358	break;	2363	break;
2359	case DRM_MODE_CONNECTOR_DVIA:	2364	case DRM_MODE_CONNECTOR_DVIA:
2360	drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);	2365	drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
Line 2435...	Line 2440...
2435	connector->doublescan_allowed = false;	2440	connector->doublescan_allowed = false;
2436	break;	2441	break;
2437	}	2442	}
Line 2438...	Line 2443...
2438		2443
2439	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {	2444	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
2440	if (i2c_bus->valid)	2445	if (i2c_bus->valid) {
-		2446	connector->polled = DRM_CONNECTOR_POLL_CONNECT \|
-		2447	DRM_CONNECTOR_POLL_DISCONNECT;
2441	connector->polled = DRM_CONNECTOR_POLL_CONNECT;	2448	}
2442	} else	2449	} else
-		2450	connector->polled = DRM_CONNECTOR_POLL_HPD;
2443	connector->polled = DRM_CONNECTOR_POLL_HPD;	2451
2444	connector->display_info.subpixel_order = subpixel_order;	2452	connector->display_info.subpixel_order = subpixel_order;
2445	drm_connector_register(connector);	2453	drm_connector_register(connector);
Line 2446...	Line 2454...
2446	}	2454	}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_connectors.c – Rev 6321 → 6661