Commit bc7e3525 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: allow platforms without eDP transcoder 



Define a HAS_TRANSCODER_EDP() macro that checks if we have defined an
offset for this transcoder. This allows platforms to be defined without
eDP transcoder.

Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190222230254.20351-2-lucas.demarchi@intel.com
parent 062de72b

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,7 @@ static inline unsigned int i915_sg_segment_size(void) 
#define HAS_DDI(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_ddi)

#define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->has_fpga_dbg)

#define HAS_PSR(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_psr)

#define HAS_TRANSCODER_EDP(dev_priv)	 (INTEL_INFO(dev_priv)->trans_offsets[TRANSCODER_EDP] != 0)



#define HAS_RC6(dev_priv)		 (INTEL_INFO(dev_priv)->has_rc6)

#define HAS_RC6p(dev_priv)		 (INTEL_INFO(dev_priv)->has_rc6p)

drivers/gpu/drm/i915/intel_ddi.c

+3 −3
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) 
		goto out;

	}



	if (port == PORT_A)

	if (HAS_TRANSCODER_EDP(dev_priv) && port == PORT_A)

		cpu_transcoder = TRANSCODER_EDP;

	else

		cpu_transcoder = (enum transcoder) pipe;
@@ -1973,7 +1973,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, 
	if (!(tmp & DDI_BUF_CTL_ENABLE))

		goto out;



	if (port == PORT_A) {

	if (HAS_TRANSCODER_EDP(dev_priv) && port == PORT_A) {

		tmp = I915_READ(TRANS_DDI_FUNC_CTL(TRANSCODER_EDP));



		switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
@@ -3871,7 +3871,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder, 
	enum port port = encoder->port;

	int ret;



	if (port == PORT_A)

	if (HAS_TRANSCODER_EDP(dev_priv) && port == PORT_A)

		pipe_config->cpu_transcoder = TRANSCODER_EDP;



	if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI))

drivers/gpu/drm/i915/intel_display.c

+4 −1
Original line number Diff line number Diff line
@@ -9688,7 +9688,7 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc, 
	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	enum intel_display_power_domain power_domain;

	unsigned long panel_transcoder_mask = BIT(TRANSCODER_EDP);

	unsigned long panel_transcoder_mask = 0;

	unsigned long enabled_panel_transcoders = 0;

	enum transcoder panel_transcoder;

	u32 tmp;
@@ -9697,6 +9697,9 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc, 
		panel_transcoder_mask |=

			BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1);



	if (HAS_TRANSCODER_EDP(dev_priv))

		panel_transcoder_mask |= BIT(TRANSCODER_EDP);



	/*

	 * The pipe->transcoder mapping is fixed with the exception of the eDP

	 * and DSI transcoders handled below.

CRA Git | Maintained and supported by SUSTech CRA and CCSE