Subversion Repositories Kolibri OS

Rev

Rev 5078 | Rev 6104 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5078 Rev 5271
Line 320... Line 320...
320 
		radeon_connector->edid = drm_get_edid(&radeon_connector->base,
 320 
		radeon_connector->edid = drm_get_edid(&radeon_connector->base,
321 
						      &radeon_connector->ddc_bus->adapter);
 321 
						      &radeon_connector->ddc_bus->adapter);
322 
	}
 322 
	}
Line 323... Line 323...
323 
 
 323 
 
- 
 
 324 
	if (!radeon_connector->edid) {
- 
 
 325 
		/* don't fetch the edid from the vbios if ddc fails and runpm is
- 
 
 326 
		 * enabled so we report disconnected.
- 
 
 327 
		 */
- 
 
 328 
		if ((rdev->flags & RADEON_IS_PX) && (radeon_runtime_pm != 0))
- 
 
 329 
			return;
324 
	if (!radeon_connector->edid) {
 330 
 
325 
		if (rdev->is_atom_bios) {
 331 
		if (rdev->is_atom_bios) {
326 
			/* some laptops provide a hardcoded edid in rom for LCDs */
 332 
			/* some laptops provide a hardcoded edid in rom for LCDs */
327 
			if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) ||
 333 
			if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) ||
328 
			     (connector->connector_type == DRM_MODE_CONNECTOR_eDP)))
 334 
			     (connector->connector_type == DRM_MODE_CONNECTOR_eDP)))
Line 824... Line 830...
824 
}
 830 
}
Line 825... Line 831...
825 
 
 831 
 
826 
static enum drm_connector_status
 832 
static enum drm_connector_status
827 
radeon_lvds_detect(struct drm_connector *connector, bool force)
 833 
radeon_lvds_detect(struct drm_connector *connector, bool force)
- 
 
 834 
{
- 
 
 835 
	struct drm_device *dev = connector->dev;
828 
{
 836 
	struct radeon_device *rdev = dev->dev_private;
829 
	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 837 
	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
830 
	struct drm_encoder *encoder = radeon_best_single_encoder(connector);
 838 
	struct drm_encoder *encoder = radeon_best_single_encoder(connector);
Line 831... Line 839...
831 
	enum drm_connector_status ret = connector_status_disconnected;
 839 
	enum drm_connector_status ret = connector_status_disconnected;