Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 882ec384 authored Apr 28, 2014 by Ville Syrjälä Committed by Daniel Vetter May 20, 2014

drm/i915/chv: Configure crtc_mask correctly for CHV



On CHV pipe C can driver only port D, and pipes A and B can drivbe only
ports B and C. Configure the crtc_mask appropriately to reflect that.

v2: Moar braces (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 8e5fd599

drivers/gpu/drm/i915/intel_dp.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4249,7 +4249,14 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
	intel_dig_port->dp.output_reg = output_reg;		intel_dig_port->dp.output_reg = output_reg;

	intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;		intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
			if (IS_CHERRYVIEW(dev)) {
			if (port == PORT_D)
			intel_encoder->crtc_mask = 1 << 2;
			else
			intel_encoder->crtc_mask = (1 << 0) \| (1 << 1);
			} else {
	intel_encoder->crtc_mask = (1 << 0) \| (1 << 1) \| (1 << 2);		intel_encoder->crtc_mask = (1 << 0) \| (1 << 1) \| (1 << 2);
			}
	intel_encoder->cloneable = 0;		intel_encoder->cloneable = 0;
	intel_encoder->hot_plug = intel_dp_hot_plug;		intel_encoder->hot_plug = intel_dp_hot_plug;

drivers/gpu/drm/i915/intel_hdmi.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1469,7 +1469,14 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
	}		}

	intel_encoder->type = INTEL_OUTPUT_HDMI;		intel_encoder->type = INTEL_OUTPUT_HDMI;
			if (IS_CHERRYVIEW(dev)) {
			if (port == PORT_D)
			intel_encoder->crtc_mask = 1 << 2;
			else
			intel_encoder->crtc_mask = (1 << 0) \| (1 << 1);
			} else {
	intel_encoder->crtc_mask = (1 << 0) \| (1 << 1) \| (1 << 2);		intel_encoder->crtc_mask = (1 << 0) \| (1 << 1) \| (1 << 2);
			}
	intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;		intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
	/*		/*
	* BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems		* BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems