Subversion Repositories Kolibri OS

Rev

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

Rev 3031 Rev 3243
Line 43... Line 43...
43 
	int ret;
 43 
	int ret;
Line 44... Line 44...
44 
 
 44 
 
45 
	drm_mode_connector_update_edid_property(connector, edid);
 45 
	drm_mode_connector_update_edid_property(connector, edid);
46 
	ret = drm_add_edid_modes(connector, edid);
 46 
	ret = drm_add_edid_modes(connector, edid);
47 
	drm_edid_to_eld(connector, edid);
 - 
 
Line 48... Line 47...
48 
	kfree(edid);
 47 
	drm_edid_to_eld(connector, edid);
49 
 
 48 
 
Line 50... Line 49...
50 
	return ret;
 49 
	return ret;
Line 59... Line 58...
59 
 */
 58 
 */
60 
int intel_ddc_get_modes(struct drm_connector *connector,
 59 
int intel_ddc_get_modes(struct drm_connector *connector,
61 
			struct i2c_adapter *adapter)
 60 
			struct i2c_adapter *adapter)
62 
{
 61 
{
63 
	struct edid *edid;
 62 
	struct edid *edid;
- 
 
 63 
	int ret;
Line 64... Line 64...
64 
 
 64 
 
65 
	edid = drm_get_edid(connector, adapter);
 65 
	edid = drm_get_edid(connector, adapter);
66 
	if (!edid)
 66 
	if (!edid)
Line 67... Line 67...
67 
		return 0;
 67 
		return 0;
- 
 
 68 
 
- 
 
 69 
	ret = intel_connector_update_modes(connector, edid);
- 
 
 70 
	kfree(edid);
68 
 
 71 
 
Line 69... Line 72...
69 
	return intel_connector_update_modes(connector, edid);
 72 
	return ret;
70 
}
 73 
}
71 
 
 74 
 
Line 92... Line 95...
92 
		if (prop == NULL)
 95 
		if (prop == NULL)
93 
			return;
 96 
			return;
Line 94... Line 97...
94 
 
 97 
 
95 
		dev_priv->force_audio_property = prop;
 98 
		dev_priv->force_audio_property = prop;
96 
	}
 99 
	}
97 
	drm_connector_attach_property(connector, prop, 0);
 100 
	drm_object_attach_property(&connector->base, prop, 0);
98 
#endif
 101 
#endif
Line 99... Line 102...
99 
}
 102 
}
100 
 
 103 
 
Line 120... Line 123...
120 
			return;
 123 
			return;
Line 121... Line 124...
121 
 
 124 
 
122 
		dev_priv->broadcast_rgb_property = prop;
 125 
		dev_priv->broadcast_rgb_property = prop;
Line 123... Line 126...
123 
	}
 126 
	}
124 
 
 127 
 
125 
	drm_connector_attach_property(connector, prop, 0);
 128 
	drm_object_attach_property(&connector->base, prop, 0);