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

Commit 03cdc1d4 authored by Pandiyan, Dhinakaran's avatar Pandiyan, Dhinakaran Committed by Rodrigo Vivi
Browse files

drm/i915: Store port enum in intel_encoder 



Storing the port enum in intel_encoder makes it convenient to know the
port attached to an encoder. Moving the port information up from
intel_digital_port to intel_encoder avoids unecessary intel_digital_port
access and handles MST encoders cleanly without requiring conditional
checks for them (thanks danvet).

v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet)
Fixed missing initialization of port in intel_sdvo.c (danvet)

v3:
Fixed missing initialization of port in intel_crt.c (Ville)

v4:
Storing port for DVO encoders too.

Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarLyude <cpaul@redhat.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474334681-22690-3-git-send-email-dhinakaran.pandiyan@intel.com
parent 5748be60

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ enum plane { 
#define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')



enum port {

	PORT_NONE = -1,

	PORT_A = 0,

	PORT_B,

	PORT_C,

drivers/gpu/drm/i915/intel_crt.c

+2 −0
Original line number Diff line number Diff line
@@ -917,10 +917,12 @@ void intel_crt_init(struct drm_device *dev) 
	if (I915_HAS_HOTPLUG(dev))

		crt->base.hpd_pin = HPD_CRT;

	if (HAS_DDI(dev)) {

		crt->base.port = PORT_E;

		crt->base.get_config = hsw_crt_get_config;

		crt->base.get_hw_state = intel_ddi_get_hw_state;

		crt->base.post_disable = hsw_post_disable_crt;

	} else {

		crt->base.port = PORT_NONE;

		crt->base.get_config = intel_crt_get_config;

		crt->base.get_hw_state = intel_crt_get_hw_state;

	}

drivers/gpu/drm/i915/intel_ddi.c

+1 −0
Original line number Diff line number Diff line
@@ -2520,6 +2520,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) 
	intel_dig_port->max_lanes = max_lanes;



	intel_encoder->type = INTEL_OUTPUT_UNKNOWN;

	intel_encoder->port = port;

	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

	intel_encoder->cloneable = 0;

drivers/gpu/drm/i915/intel_dp.c

+1 −0
Original line number Diff line number Diff line
@@ -5832,6 +5832,7 @@ bool intel_dp_init(struct drm_device *dev, 
		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

	}

	intel_encoder->cloneable = 0;

	intel_encoder->port = port;



	intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;

	dev_priv->hotplug.irq_port[port] = intel_dig_port;

drivers/gpu/drm/i915/intel_dp_mst.c

+1 −0
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum 
			 DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));



	intel_encoder->type = INTEL_OUTPUT_DP_MST;

	intel_encoder->port = intel_dig_port->port;

	intel_encoder->crtc_mask = 0x7;

	intel_encoder->cloneable = 0;