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

     /**
      * This is used to select the color range of RBG outputs in HDMI mode.
      * It is only valid when using TMDS encoding and 8 bit per color mode.
      */
     uint32_t color_range;
+	bool color_range_auto;
     /**
      * This is set if we're going to treat the device as TV-out.
+     *
      * This is set if we treat the device as HDMI, instead of DVI.
      */
     bool is_hdmi;
     bool has_hdmi_monitor;
     bool has_hdmi_audio;
+	bool rgb_quant_range_selectable;
     /**
      * This is set if we detect output of sdvo device as LVDS and
      * have a valid fixed mode to use with the panel.
 	return intel_sdvo_set_value(intel_sdvo,
 				    SDVO_CMD_SET_HBUF_TXRATE,
 				    &tx_rate, 1);
+}
+static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
-static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo)
+					 const struct drm_display_mode *adjusted_mode)
+{
 	struct dip_infoframe avi_if = {
 		.type = DIP_TYPE_AVI,
 		.ver = DIP_VERSION_AVI,
 		.len = DIP_LEN_AVI,
 	};
+	uint8_t sdvo_data[4 + sizeof(avi_if.body.avi)];
+	if (intel_sdvo->rgb_quant_range_selectable) {
+		if (adjusted_mode->private_flags & INTEL_MODE_LIMITED_COLOR_RANGE)
+			avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_LIMITED;
+		else
+			avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL;
 	uint8_t sdvo_data[4 + sizeof(avi_if.body.avi)];
 	intel_dip_infoframe_csum(&avi_if);
 	 * SDVO device will factor out the multiplier during mode_set.
 	 */
 	multiplier = intel_sdvo_get_pixel_multiplier(adjusted_mode);
 	intel_mode_set_pixel_multiplier(adjusted_mode, multiplier);
+	if (intel_sdvo->color_range_auto) {
+		/* See CEA-861-E - 5.1 Default Encoding Parameters */
+		if (intel_sdvo->has_hdmi_monitor &&
+		    drm_match_cea_mode(adjusted_mode) > 1)
+			intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
+		else
+			intel_sdvo->color_range = 0;
+	}
+	if (intel_sdvo->color_range)
+		adjusted_mode->private_flags |= INTEL_MODE_LIMITED_COLOR_RANGE;
 	return true;
+}
 	if (intel_sdvo->has_hdmi_monitor) {
 		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);
 		intel_sdvo_set_colorimetry(intel_sdvo,
 					   SDVO_COLORIMETRY_RGB256);
-		intel_sdvo_set_avi_infoframe(intel_sdvo);
+		intel_sdvo_set_avi_infoframe(intel_sdvo, adjusted_mode);
 	} else
 		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_DVI);
 	/* Set the SDVO control regs. */
 	if (INTEL_INFO(dev)->gen >= 4) {
 		/* The real mode polarity is set by the SDVO commands, using
 		 * struct intel_sdvo_dtd. */
 		sdvox = SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH;
-		if (intel_sdvo->is_hdmi)
+		if (!HAS_PCH_SPLIT(dev) && intel_sdvo->is_hdmi)
 			sdvox |= intel_sdvo->color_range;
 		if (INTEL_INFO(dev)->gen < 5)
 			sdvox |= SDVO_BORDER_ENABLE;
 	} else {
 		sdvox = I915_READ(intel_sdvo->sdvo_reg);
 		if (edid->input & DRM_EDID_INPUT_DIGITAL) {
 			status = connector_status_connected;
 			if (intel_sdvo->is_hdmi) {
 				intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);
 				intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);
+				intel_sdvo->rgb_quant_range_selectable =
+					drm_rgb_quant_range_selectable(edid);
+			}
 		} else
 			status = connector_status_disconnected;
 		kfree(edid);
+	}
 	intel_sdvo->attached_output = response;
+	intel_sdvo->has_hdmi_monitor = false;
-	intel_sdvo->has_hdmi_monitor = false;
+	intel_sdvo->has_hdmi_audio = false;
-	intel_sdvo->has_hdmi_audio = false;
+	intel_sdvo->rgb_quant_range_selectable = false;
 	if ((intel_sdvo_connector->output_flag & response) == 0)
 	ret = drm_object_property_set_value(&connector->base, property, val);
 	if (ret)
-		return ret;
 		return ret;
 #if 0
 	if (property == dev_priv->force_audio_property) {
 		int i = val;
 		intel_sdvo->has_hdmi_audio = has_audio;
 		goto done;
+	}
+	if (property == dev_priv->broadcast_rgb_property) {
+		switch (val) {
-	if (property == dev_priv->broadcast_rgb_property) {
+		case INTEL_BROADCAST_RGB_AUTO:
-		if (val == !!intel_sdvo->color_range)
+			intel_sdvo->color_range_auto = true;
+			break;
+		case INTEL_BROADCAST_RGB_FULL:
+			intel_sdvo->color_range_auto = false;
-			return 0;
+			intel_sdvo->color_range = 0;
+			break;
+		case INTEL_BROADCAST_RGB_LIMITED:
+			intel_sdvo->color_range_auto = false;
+			intel_sdvo->color_range = SDVO_COLOR_RANGE_16_235;
+			break;
+		default:
+			return -EINVAL;
 		intel_sdvo->color_range = val ? SDVO_COLOR_RANGE_16_235 : 0;
 		goto done;
-	}
 #endif
 #define CHECK_PROPERTY(name, NAME) \
 	if (intel_sdvo_connector->name == property) { \
 	if (!intel_sdvo_set_value(intel_sdvo, cmd, &temp_value, 2))
 		return -EIO;
 done:
-	if (intel_sdvo->base.base.crtc) {
-		struct drm_crtc *crtc = intel_sdvo->base.base.crtc;
-		intel_set_mode(crtc, &crtc->mode,
-			       crtc->x, crtc->y, crtc->fb);
+	if (intel_sdvo->base.base.crtc)
 		intel_crtc_restore_mode(intel_sdvo->base.base.crtc);
 	return 0;
 #undef CHECK_PROPERTY
+}
 static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
-	.mode_fixup = intel_sdvo_mode_fixup,
+static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
-	.mode_set = intel_sdvo_mode_set,
+	.mode_fixup = intel_sdvo_mode_fixup,
-	.disable = intel_encoder_noop,
+	.mode_set = intel_sdvo_mode_set,
 	intel_connector_attach_encoder(&connector->base, &encoder->base);
 	drm_sysfs_connector_add(&connector->base.base);
+}
 static void
+intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo,
-intel_sdvo_add_hdmi_properties(struct intel_sdvo_connector *connector)
+			       struct intel_sdvo_connector *connector)
+{
 	struct drm_device *dev = connector->base.base.dev;
 	intel_attach_force_audio_property(&connector->base.base);
+	if (INTEL_INFO(dev)->gen >= 4 && IS_MOBILE(dev)) {
+		intel_attach_broadcast_rgb_property(&connector->base.base);
-	if (INTEL_INFO(dev)->gen >= 4 && IS_MOBILE(dev))
+		intel_sdvo->color_range_auto = true;
 		intel_attach_broadcast_rgb_property(&connector->base.base);
+}
 		intel_sdvo->is_hdmi = true;
+	}
 	intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
 	if (intel_sdvo->is_hdmi)
-		intel_sdvo_add_hdmi_properties(intel_sdvo_connector);
+		intel_sdvo_add_hdmi_properties(intel_sdvo, intel_sdvo_connector);
 	return true;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_sdvo.c – Rev 3243 → 3480