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

+{
 	struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi);
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t enabled_bits;
-	enabled_bits = IS_HASWELL(dev) ? DDI_BUF_CTL_ENABLE : SDVO_ENABLE;
+	enabled_bits = HAS_DDI(dev) ? DDI_BUF_CTL_ENABLE : SDVO_ENABLE;
 	WARN(I915_READ(intel_hdmi->sdvox_reg) & enabled_bits,
+}
 static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
 					 struct drm_display_mode *adjusted_mode)
+{
 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
 	struct dip_infoframe avi_if = {
 		.type = DIP_TYPE_AVI,
 		.ver = DIP_VERSION_AVI,
 		.len = DIP_LEN_AVI,
 	};
+	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
+		avi_if.body.avi.YQ_CN_PR |= DIP_AVI_PR_2;
+	if (intel_hdmi->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
-	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
+			avi_if.body.avi.ITC_EC_Q_SC |= DIP_AVI_RGB_QUANT_RANGE_FULL;
 		avi_if.body.avi.YQ_CN_PR |= DIP_AVI_PR_2;
-	avi_if.body.avi.VIC = drm_mode_cea_vic(adjusted_mode);
+	avi_if.body.avi.VIC = drm_match_cea_mode(adjusted_mode);
 static void g4x_set_infoframes(struct drm_encoder *encoder,
 			       struct drm_display_mode *adjusted_mode)
+{
+	struct drm_i915_private *dev_priv = encoder->dev->dev_private;
-	struct drm_i915_private *dev_priv = encoder->dev->dev_private;
+	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
-	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+	struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
 	u32 reg = VIDEO_DIP_CTL;
 	u32 val = I915_READ(reg);
 	u32 port;
 		I915_WRITE(reg, val);
 		POSTING_READ(reg);
 		return;
+	}
-	switch (intel_hdmi->sdvox_reg) {
+	switch (intel_dig_port->port) {
-	case SDVOB:
+	case PORT_B:
 		port = VIDEO_DIP_PORT_B;
 		break;
-	case SDVOC:
+	case PORT_C:
 		port = VIDEO_DIP_PORT_C;
 		break;
 	default:
 		BUG();
 static void ibx_set_infoframes(struct drm_encoder *encoder,
 			       struct drm_display_mode *adjusted_mode)
+{
 	struct drm_i915_private *dev_priv = encoder->dev->dev_private;
 	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
+	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
-	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+	struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
 	u32 reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
 	u32 val = I915_READ(reg);
 	u32 port;
 		I915_WRITE(reg, val);
 		POSTING_READ(reg);
 		return;
+	}
-	switch (intel_hdmi->sdvox_reg) {
+	switch (intel_dig_port->port) {
-	case HDMIB:
+	case PORT_B:
 		port = VIDEO_DIP_PORT_B;
 		break;
-	case HDMIC:
+	case PORT_C:
 		port = VIDEO_DIP_PORT_C;
 		break;
-	case HDMID:
+	case PORT_D:
 		port = VIDEO_DIP_PORT_D;
 		break;
 	default:
 		BUG();
 bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,
 				  const struct drm_display_mode *mode,
 				  struct drm_display_mode *adjusted_mode)
-{
-	return true;
-}
-static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
 {
-	struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi);
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	uint32_t bit;
+	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
-	switch (intel_hdmi->sdvox_reg) {
+	if (intel_hdmi->color_range_auto) {
-	case SDVOB:
-		bit = HDMIB_HOTPLUG_LIVE_STATUS;
+		/* See CEA-861-E - 5.1 Default Encoding Parameters */
-		break;
+		if (intel_hdmi->has_hdmi_sink &&
-	case SDVOC:
+		    drm_match_cea_mode(adjusted_mode) > 1)
-		bit = HDMIC_HOTPLUG_LIVE_STATUS;
-		break;
+			intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235;
-	default:
-		bit = 0;
+		else
+			intel_hdmi->color_range = 0;
-		break;
+	}
+	if (intel_hdmi->color_range)
 		adjusted_mode->private_flags |= INTEL_MODE_LIMITED_COLOR_RANGE;
-	return I915_READ(PORT_HOTPLUG_STAT) & bit;
+	return true;
+}
 static enum drm_connector_status
-static enum drm_connector_status
+intel_hdmi_detect(struct drm_connector *connector, bool force)
 intel_hdmi_detect(struct drm_connector *connector, bool force)
 	struct drm_device *dev = connector->dev;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct intel_digital_port *intel_dig_port =
 		hdmi_to_dig_port(intel_hdmi);
-	struct intel_encoder *intel_encoder = &intel_dig_port->base;
-	struct drm_i915_private *dev_priv = connector->dev->dev_private;
-	struct edid *edid;
-	enum drm_connector_status status = connector_status_disconnected;
+	struct intel_encoder *intel_encoder = &intel_dig_port->base;
 	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct edid *edid;
-	if (IS_G4X(connector->dev) && !g4x_hdmi_connected(intel_hdmi))
+	enum drm_connector_status status = connector_status_disconnected;
 		return status;
 	intel_hdmi->has_hdmi_sink = false;
-	intel_hdmi->has_hdmi_sink = false;
+	intel_hdmi->has_audio = false;
 			status = connector_status_connected;
 			if (intel_hdmi->force_audio != HDMI_AUDIO_OFF_DVI)
 				intel_hdmi->has_hdmi_sink =
 						drm_detect_hdmi_monitor(edid);
 			intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
+			intel_hdmi->rgb_quant_range_selectable =
+				drm_rgb_quant_range_selectable(edid);
+		}
 		kfree(edid);
+	}
 	int ret;
 	ret = drm_object_property_set_value(&connector->base, property, val);
 	if (ret)
 		return ret;
 #if 0
 	if (property == dev_priv->force_audio_property) {
 		enum hdmi_force_audio i = val;
 		bool has_audio;
 			intel_hdmi->has_hdmi_sink = 0;
 		intel_hdmi->has_audio = has_audio;
 		goto done;
-	}
 #endif
+	if (property == dev_priv->broadcast_rgb_property) {
+		switch (val) {
-	if (property == dev_priv->broadcast_rgb_property) {
+		case INTEL_BROADCAST_RGB_AUTO:
+			intel_hdmi->color_range_auto = true;
+			break;
+		case INTEL_BROADCAST_RGB_FULL:
-		if (val == !!intel_hdmi->color_range)
+			intel_hdmi->color_range_auto = false;
+			intel_hdmi->color_range = 0;
+			break;
-			return 0;
+		case INTEL_BROADCAST_RGB_LIMITED:
+			intel_hdmi->color_range_auto = false;
+			intel_hdmi->color_range = SDVO_COLOR_RANGE_16_235;
+			break;
+		default:
 			return -EINVAL;
 		intel_hdmi->color_range = val ? SDVO_COLOR_RANGE_16_235 : 0;
 		goto done;
+	}
 	return -EINVAL;
-done:
-	if (intel_dig_port->base.base.crtc) {
 		struct drm_crtc *crtc = intel_dig_port->base.base.crtc;
-		intel_set_mode(crtc, &crtc->mode,
+done:
-			       crtc->x, crtc->y, crtc->fb);
+	if (intel_dig_port->base.base.crtc)
+}
 static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
 	.mode_fixup = intel_hdmi_mode_fixup,
-	.mode_set = intel_hdmi_mode_set,
-	.disable = intel_encoder_noop,
+	.mode_set = intel_hdmi_mode_set,
 };
 static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
 static void
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector)
+{
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
+	intel_hdmi->color_range_auto = true;
+}
 void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 			       struct intel_connector *intel_connector)
 	connector->doublescan_allowed = 0;
 	switch (port) {
 	case PORT_B:
 		intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
-		dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
+		dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
 		break;
 	case PORT_C:
 		intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
-		dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
+		dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
 		break;
 	case PORT_D:
 		intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
-		dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS;
+		dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
 		break;
 	case PORT_A:
 		/* Internal port only for eDP. */
 	default:
 	} else {
 		intel_hdmi->write_infoframe = cpt_write_infoframe;
 		intel_hdmi->set_infoframes = cpt_set_infoframes;
+	}
-	if (IS_HASWELL(dev))
+	if (HAS_DDI(dev))
 		intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
 	else
 	intel_connector->get_hw_state = intel_connector_get_hw_state;

Subversion Repositories Kolibri OS

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