WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_modes.c


/*
 * Copyright (c) 2007 Dave Airlie 
 * Copyright (c) 2007, 2010 Intel Corporation
 *   Jesse Barnes 
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */
 
#include 
#include 
#include 
#include 
#include 
#include "intel_drv.h"
#include "i915_drv.h"
 
/**
 * intel_connector_update_modes - update connector from edid
 * @connector: DRM connector device to use
 * @edid: previously read EDID information
 */
int intel_connector_update_modes(struct drm_connector *connector,
				struct edid *edid)
{
	int ret;
 
	drm_mode_connector_update_edid_property(connector, edid);
	ret = drm_add_edid_modes(connector, edid);
	drm_edid_to_eld(connector, edid);
 
	return ret;
}
 
/**
 * intel_ddc_get_modes - get modelist from monitor
 * @connector: DRM connector device to use
 * @adapter: i2c adapter
 *
 * Fetch the EDID information from @connector using the DDC bus.
 */
int intel_ddc_get_modes(struct drm_connector *connector,
			struct i2c_adapter *adapter)
{
	struct edid *edid;
	int ret;
 
	edid = drm_get_edid(connector, adapter);
	if (!edid)
		return 0;
 
	ret = intel_connector_update_modes(connector, edid);
	kfree(edid);
 
	return ret;
}
 
static const struct drm_prop_enum_list force_audio_names[] = {
	{ HDMI_AUDIO_OFF_DVI, "force-dvi" },
	{ HDMI_AUDIO_OFF, "off" },
	{ HDMI_AUDIO_AUTO, "auto" },
	{ HDMI_AUDIO_ON, "on" },
};
 
void
intel_attach_force_audio_property(struct drm_connector *connector)
{
	struct drm_device *dev = connector->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	struct drm_property *prop;
 
	prop = dev_priv->force_audio_property;
	if (prop == NULL) {
		prop = drm_property_create_enum(dev, 0,
					   "audio",
					   force_audio_names,
					   ARRAY_SIZE(force_audio_names));
		if (prop == NULL)
			return;
 
		dev_priv->force_audio_property = prop;
	}
	drm_object_attach_property(&connector->base, prop, 0);
}
 
static const struct drm_prop_enum_list broadcast_rgb_names[] = {
	{ INTEL_BROADCAST_RGB_AUTO, "Automatic" },
	{ INTEL_BROADCAST_RGB_FULL, "Full" },
	{ INTEL_BROADCAST_RGB_LIMITED, "Limited 16:235" },
};
 
void
intel_attach_broadcast_rgb_property(struct drm_connector *connector)
{
	struct drm_device *dev = connector->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	struct drm_property *prop;
 
	prop = dev_priv->broadcast_rgb_property;
	if (prop == NULL) {
		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
					   "Broadcast RGB",
					   broadcast_rgb_names,
					   ARRAY_SIZE(broadcast_rgb_names));
		if (prop == NULL)
			return;
 
		dev_priv->broadcast_rgb_property = prop;
	}
 
	drm_object_attach_property(&connector->base, prop, 0);
}
 
void
intel_attach_aspect_ratio_property(struct drm_connector *connector)
{
	if (!drm_mode_create_aspect_ratio_property(connector->dev))
		drm_object_attach_property(&connector->base,
			connector->dev->mode_config.aspect_ratio_property,
			DRM_MODE_PICTURE_ASPECT_NONE);
}

Rev 3480	Rev 6084
1	/*	1	/*
2	* Copyright (c) 2007 Dave Airlie	2	* Copyright (c) 2007 Dave Airlie
3	* Copyright (c) 2007, 2010 Intel Corporation	3	* Copyright (c) 2007, 2010 Intel Corporation
4	* Jesse Barnes	4	* Jesse Barnes
5	*	5	*
6	* Permission is hereby granted, free of charge, to any person obtaining a	6	* Permission is hereby granted, free of charge, to any person obtaining a
7	* copy of this software and associated documentation files (the "Software"),	7	* copy of this software and associated documentation files (the "Software"),
8	* to deal in the Software without restriction, including without limitation	8	* to deal in the Software without restriction, including without limitation
9	* the rights to use, copy, modify, merge, publish, distribute, sublicense,	9	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
10	* and/or sell copies of the Software, and to permit persons to whom the	10	* and/or sell copies of the Software, and to permit persons to whom the
11	* Software is furnished to do so, subject to the following conditions:	11	* Software is furnished to do so, subject to the following conditions:
12	*	12	*
13	* The above copyright notice and this permission notice (including the next	13	* The above copyright notice and this permission notice (including the next
14	* paragraph) shall be included in all copies or substantial portions of the	14	* paragraph) shall be included in all copies or substantial portions of the
15	* Software.	15	* Software.
16	*	16	*
17	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR	17	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,	18	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL	19	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20	* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER	20	* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21	* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING	21	* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	22	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23	* DEALINGS IN THE SOFTWARE.	23	* DEALINGS IN THE SOFTWARE.
24	*/	24	*/
25		25
26	#include	26	#include
27	#include	27	#include
28	#include	28	#include
29	#include	29	#include
30	#include	30	#include
31	#include "intel_drv.h"	31	#include "intel_drv.h"
32	#include "i915_drv.h"	32	#include "i915_drv.h"
33		33
34	/**	34	/**
35	* intel_connector_update_modes - update connector from edid	35	* intel_connector_update_modes - update connector from edid
36	* @connector: DRM connector device to use	36	* @connector: DRM connector device to use
37	* @edid: previously read EDID information	37	* @edid: previously read EDID information
38	*/	38	*/
39	int intel_connector_update_modes(struct drm_connector *connector,	39	int intel_connector_update_modes(struct drm_connector *connector,
40	struct edid *edid)	40	struct edid *edid)
41	{	41	{
42	int ret;	42	int ret;
43		43
44	drm_mode_connector_update_edid_property(connector, edid);	44	drm_mode_connector_update_edid_property(connector, edid);
45	ret = drm_add_edid_modes(connector, edid);	45	ret = drm_add_edid_modes(connector, edid);
46	drm_edid_to_eld(connector, edid);	46	drm_edid_to_eld(connector, edid);
47		47
48	return ret;	48	return ret;
49	}	49	}
50		50
51	/**	51	/**
52	* intel_ddc_get_modes - get modelist from monitor	52	* intel_ddc_get_modes - get modelist from monitor
53	* @connector: DRM connector device to use	53	* @connector: DRM connector device to use
54	* @adapter: i2c adapter	54	* @adapter: i2c adapter
55	*	55	*
56	* Fetch the EDID information from @connector using the DDC bus.	56	* Fetch the EDID information from @connector using the DDC bus.
57	*/	57	*/
58	int intel_ddc_get_modes(struct drm_connector *connector,	58	int intel_ddc_get_modes(struct drm_connector *connector,
59	struct i2c_adapter *adapter)	59	struct i2c_adapter *adapter)
60	{	60	{
61	struct edid *edid;	61	struct edid *edid;
62	int ret;	62	int ret;
63		63
64	edid = drm_get_edid(connector, adapter);	64	edid = drm_get_edid(connector, adapter);
65	if (!edid)	65	if (!edid)
66	return 0;	66	return 0;
67		67
68	ret = intel_connector_update_modes(connector, edid);	68	ret = intel_connector_update_modes(connector, edid);
69	kfree(edid);	69	kfree(edid);
70		70
71	return ret;	71	return ret;
72	}	72	}
73		73
74	static const struct drm_prop_enum_list force_audio_names[] = {	74	static const struct drm_prop_enum_list force_audio_names[] = {
75	{ HDMI_AUDIO_OFF_DVI, "force-dvi" },	75	{ HDMI_AUDIO_OFF_DVI, "force-dvi" },
76	{ HDMI_AUDIO_OFF, "off" },	76	{ HDMI_AUDIO_OFF, "off" },
77	{ HDMI_AUDIO_AUTO, "auto" },	77	{ HDMI_AUDIO_AUTO, "auto" },
78	{ HDMI_AUDIO_ON, "on" },	78	{ HDMI_AUDIO_ON, "on" },
79	};	79	};
80		80
81	void	81	void
82	intel_attach_force_audio_property(struct drm_connector *connector)	82	intel_attach_force_audio_property(struct drm_connector *connector)
83	{	83	{
84	struct drm_device *dev = connector->dev;	84	struct drm_device *dev = connector->dev;
85	struct drm_i915_private *dev_priv = dev->dev_private;	85	struct drm_i915_private *dev_priv = dev->dev_private;
86	struct drm_property *prop;	86	struct drm_property *prop;
87		87
88	prop = dev_priv->force_audio_property;	88	prop = dev_priv->force_audio_property;
89	if (prop == NULL) {	89	if (prop == NULL) {
90	prop = drm_property_create_enum(dev, 0,	90	prop = drm_property_create_enum(dev, 0,
91	"audio",	91	"audio",
92	force_audio_names,	92	force_audio_names,
93	ARRAY_SIZE(force_audio_names));	93	ARRAY_SIZE(force_audio_names));
94	if (prop == NULL)	94	if (prop == NULL)
95	return;	95	return;
96		96
97	dev_priv->force_audio_property = prop;	97	dev_priv->force_audio_property = prop;
98	}	98	}
99	drm_object_attach_property(&connector->base, prop, 0);	99	drm_object_attach_property(&connector->base, prop, 0);
100	}	100	}
101		101
102	static const struct drm_prop_enum_list broadcast_rgb_names[] = {	102	static const struct drm_prop_enum_list broadcast_rgb_names[] = {
103	{ INTEL_BROADCAST_RGB_AUTO, "Automatic" },	103	{ INTEL_BROADCAST_RGB_AUTO, "Automatic" },
104	{ INTEL_BROADCAST_RGB_FULL, "Full" },	104	{ INTEL_BROADCAST_RGB_FULL, "Full" },
105	{ INTEL_BROADCAST_RGB_LIMITED, "Limited 16:235" },	105	{ INTEL_BROADCAST_RGB_LIMITED, "Limited 16:235" },
106	};	106	};
107		107
108	void	108	void
109	intel_attach_broadcast_rgb_property(struct drm_connector *connector)	109	intel_attach_broadcast_rgb_property(struct drm_connector *connector)
110	{	110	{
111	struct drm_device *dev = connector->dev;	111	struct drm_device *dev = connector->dev;
112	struct drm_i915_private *dev_priv = dev->dev_private;	112	struct drm_i915_private *dev_priv = dev->dev_private;
113	struct drm_property *prop;	113	struct drm_property *prop;
114		114
115	prop = dev_priv->broadcast_rgb_property;	115	prop = dev_priv->broadcast_rgb_property;
116	if (prop == NULL) {	116	if (prop == NULL) {
117	prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,	117	prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
118	"Broadcast RGB",	118	"Broadcast RGB",
119	broadcast_rgb_names,	119	broadcast_rgb_names,
120	ARRAY_SIZE(broadcast_rgb_names));	120	ARRAY_SIZE(broadcast_rgb_names));
121	if (prop == NULL)	121	if (prop == NULL)
122	return;	122	return;
123		123
124	dev_priv->broadcast_rgb_property = prop;	124	dev_priv->broadcast_rgb_property = prop;
125	}	125	}
126		126
127	drm_object_attach_property(&connector->base, prop, 0);	127	drm_object_attach_property(&connector->base, prop, 0);
128	}	128	}
-		129
-		130	void
-		131	intel_attach_aspect_ratio_property(struct drm_connector *connector)
-		132	{
-		133	if (!drm_mode_create_aspect_ratio_property(connector->dev))
-		134	drm_object_attach_property(&connector->base,
-		135	connector->dev->mode_config.aspect_ratio_property,
-		136	DRM_MODE_PICTURE_ASPECT_NONE);
-		137	}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_modes.c @ 6132 – Rev 3480 → 6084