aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sdvo.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-01-17 09:31:29 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-20 07:09:44 -0500
commit55bc60db5988c8366751d3d04dd690698a53412c (patch)
tree1fc546713d825d8b2892d2b113f36c965008f7f1 /drivers/gpu/drm/i915/intel_sdvo.c
parent3685a8f38f2c54bb6058c0e66ae0562f8ab84e66 (diff)
drm/i915: Add "Automatic" mode for the "Broadcast RGB" property
Add a new "Automatic" mode to the "Broadcast RGB" range property. When selected the driver automagically selects between full range and limited range output. Based on CEA-861 [1] guidelines, limited range output is selected if the mode is a CEA mode, except 640x480. Otherwise full range output is used. Additionally DVI monitors should most likely default to full range always. As per DP1.2a [2] DisplayPort should always use full range for 18bpp, and otherwise will follow CEA-861 rules. NOTE: The default value for the property will now be "Automatic" so some people may be affected in case they're relying on the current full range default. [1] CEA-861-E - 5.1 Default Encoding Parameters [2] VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry v2: Use has_hdmi_sink to check if a HDMI monitor is present v3: Add information about relevant spec chapters Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c38
1 files changed, 31 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 3b8491af1f23..3e34a3592e32 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -103,6 +103,7 @@ struct intel_sdvo {
103 * It is only valid when using TMDS encoding and 8 bit per color mode. 103 * It is only valid when using TMDS encoding and 8 bit per color mode.
104 */ 104 */
105 uint32_t color_range; 105 uint32_t color_range;
106 bool color_range_auto;
106 107
107 /** 108 /**
108 * This is set if we're going to treat the device as TV-out. 109 * This is set if we're going to treat the device as TV-out.
@@ -1064,6 +1065,15 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
1064 multiplier = intel_sdvo_get_pixel_multiplier(adjusted_mode); 1065 multiplier = intel_sdvo_get_pixel_multiplier(adjusted_mode);
1065 intel_mode_set_pixel_multiplier(adjusted_mode, multiplier); 1066 intel_mode_set_pixel_multiplier(adjusted_mode, multiplier);
1066 1067
1068 if (intel_sdvo->color_range_auto) {
1069 /* See CEA-861-E - 5.1 Default Encoding Parameters */
1070 if (intel_sdvo->has_hdmi_monitor &&
1071 drm_mode_cea_vic(adjusted_mode) > 1)
1072 intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
1073 else
1074 intel_sdvo->color_range = 0;
1075 }
1076
1067 if (intel_sdvo->color_range) 1077 if (intel_sdvo->color_range)
1068 adjusted_mode->private_flags |= INTEL_MODE_LIMITED_COLOR_RANGE; 1078 adjusted_mode->private_flags |= INTEL_MODE_LIMITED_COLOR_RANGE;
1069 1079
@@ -1900,10 +1910,21 @@ intel_sdvo_set_property(struct drm_connector *connector,
1900 } 1910 }
1901 1911
1902 if (property == dev_priv->broadcast_rgb_property) { 1912 if (property == dev_priv->broadcast_rgb_property) {
1903 if (val == !!intel_sdvo->color_range) 1913 switch (val) {
1904 return 0; 1914 case INTEL_BROADCAST_RGB_AUTO:
1905 1915 intel_sdvo->color_range_auto = true;
1906 intel_sdvo->color_range = val ? SDVO_COLOR_RANGE_16_235 : 0; 1916 break;
1917 case INTEL_BROADCAST_RGB_FULL:
1918 intel_sdvo->color_range_auto = false;
1919 intel_sdvo->color_range = 0;
1920 break;
1921 case INTEL_BROADCAST_RGB_LIMITED:
1922 intel_sdvo->color_range_auto = false;
1923 intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
1924 break;
1925 default:
1926 return -EINVAL;
1927 }
1907 goto done; 1928 goto done;
1908 } 1929 }
1909 1930
@@ -2200,13 +2221,16 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
2200} 2221}
2201 2222
2202static void 2223static void
2203intel_sdvo_add_hdmi_properties(struct intel_sdvo_connector *connector) 2224intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo,
2225 struct intel_sdvo_connector *connector)
2204{ 2226{
2205 struct drm_device *dev = connector->base.base.dev; 2227 struct drm_device *dev = connector->base.base.dev;
2206 2228
2207 intel_attach_force_audio_property(&connector->base.base); 2229 intel_attach_force_audio_property(&connector->base.base);
2208 if (INTEL_INFO(dev)->gen >= 4 && IS_MOBILE(dev)) 2230 if (INTEL_INFO(dev)->gen >= 4 && IS_MOBILE(dev)) {
2209 intel_attach_broadcast_rgb_property(&connector->base.base); 2231 intel_attach_broadcast_rgb_property(&connector->base.base);
2232 intel_sdvo->color_range_auto = true;
2233 }
2210} 2234}
2211 2235
2212static bool 2236static bool
@@ -2254,7 +2278,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
2254 2278
2255 intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo); 2279 intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
2256 if (intel_sdvo->is_hdmi) 2280 if (intel_sdvo->is_hdmi)
2257 intel_sdvo_add_hdmi_properties(intel_sdvo_connector); 2281 intel_sdvo_add_hdmi_properties(intel_sdvo, intel_sdvo_connector);
2258 2282
2259 return true; 2283 return true;
2260} 2284}