Commit b4d7049a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2021-07-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



drm/i915 changes for v5.15:

Features:
- Enable pipe DMC loading on XE-LPD and ADL-P (Anusha)
- Finally remove JSH and EHL force probe requirement (Tejas)

Refactoring and cleanups:
- Refactor and fix DDI buffer translations (Ville)
- Clean up FBC CFB allocation code (Ville, with a fix from Matthew)
- Finish INTEL_GEN() and friends macro conversions (Lucas)
- Misc display cleanups (Ville)

Fixes:
- PSR fixes and ADL-P workarounds (José)
- Fix drm infoframe state mismatch (Bhanuprakash)
- Force Type-C PHY disconnect during suspend/shutdown (Imre)
- Fix power sequence violation on some Chromebook models (Shawn)
- Fix VGA workaround to avoid screen flicker at boot (Emil)
- Fix display 12+ watermark workaround adjustment (Lucas)

Misc:
- Backmerge drm-next (Jani)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/878s2h6t5o.fsf@intel.com
parents 2734d6c1 cd5606aa

drivers/gpu/drm/i915/display/icl_dsi.c

+44 −2
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc);

	enum pipe pipe = intel_crtc->pipe;

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

	enum pipe pipe = crtc->pipe;

	u32 tmp;

	enum port port;

	enum transcoder dsi_trans;
@@ -1253,15 +1253,36 @@ static void gen11_dsi_pre_enable(struct intel_atomic_state *state, 
	gen11_dsi_set_transcoder_timings(encoder, pipe_config);

}



/*

 * Wa_1409054076:icl,jsl,ehl

 * When pipe A is disabled and MIPI DSI is enabled on pipe B,

 * the AMT KVMR feature will incorrectly see pipe A as enabled.

 * Set 0x42080 bit 23=1 before enabling DSI on pipe B and leave

 * it set while DSI is enabled on pipe B

 */

static void icl_apply_kvmr_pipe_a_wa(struct intel_encoder *encoder,

				     enum pipe pipe, bool enable)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	if (DISPLAY_VER(dev_priv) == 11 && pipe == PIPE_B)

		intel_de_rmw(dev_priv, CHICKEN_PAR1_1,

			     IGNORE_KVMR_PIPE_A,

			     enable ? IGNORE_KVMR_PIPE_A : 0);

}

static void gen11_dsi_enable(struct intel_atomic_state *state,

			     struct intel_encoder *encoder,

			     const struct intel_crtc_state *crtc_state,

			     const struct drm_connector_state *conn_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct intel_crtc *crtc = to_intel_crtc(conn_state->crtc);



	drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);



	/* Wa_1409054076:icl,jsl,ehl */

	icl_apply_kvmr_pipe_a_wa(encoder, crtc->pipe, true);



	/* step6d: enable dsi transcoder */

	gen11_dsi_enable_transcoder(encoder);
@@ -1415,6 +1436,7 @@ static void gen11_dsi_disable(struct intel_atomic_state *state, 
			      const struct drm_connector_state *old_conn_state)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct intel_crtc *crtc = to_intel_crtc(old_conn_state->crtc);



	/* step1: turn off backlight */

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_OFF);
@@ -1423,6 +1445,9 @@ static void gen11_dsi_disable(struct intel_atomic_state *state, 
	/* step2d,e: disable transcoder and wait */

	gen11_dsi_disable_transcoder(encoder);



	/* Wa_1409054076:icl,jsl,ehl */

	icl_apply_kvmr_pipe_a_wa(encoder, crtc->pipe, false);



	/* step2f,g: powerdown panel */

	gen11_dsi_powerdown_panel(encoder);
@@ -1548,6 +1573,22 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, 
		pipe_config->mode_flags |= I915_MODE_FLAG_DSI_PERIODIC_CMD_MODE;

}



static void gen11_dsi_sync_state(struct intel_encoder *encoder,

				 const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->uapi.crtc);

	enum pipe pipe = intel_crtc->pipe;



	/* wa verify 1409054076:icl,jsl,ehl */

	if (DISPLAY_VER(dev_priv) == 11 && pipe == PIPE_B &&

	    !(intel_de_read(dev_priv, CHICKEN_PAR1_1) & IGNORE_KVMR_PIPE_A))

		drm_dbg_kms(&dev_priv->drm,

			    "[ENCODER:%d:%s] BIOS left IGNORE_KVMR_PIPE_A cleared with pipe B enabled\n",

			    encoder->base.base.id,

			    encoder->base.name);

}



static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder,

					struct intel_crtc_state *crtc_state)

{
@@ -1966,6 +2007,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
	encoder->post_disable = gen11_dsi_post_disable;

	encoder->port = port;

	encoder->get_config = gen11_dsi_get_config;

	encoder->sync_state = gen11_dsi_sync_state;

	encoder->update_pipe = intel_panel_update_backlight;

	encoder->compute_config = gen11_dsi_compute_config;

	encoder->get_hw_state = gen11_dsi_get_hw_state;

drivers/gpu/drm/i915/display/intel_crt.c

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "intel_crt.h"

#include "intel_crtc.h"

#include "intel_ddi.h"

#include "intel_ddi_buf_trans.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_fdi.h"
@@ -1081,6 +1082,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv) 
		crt->base.enable_clock = hsw_ddi_enable_clock;

		crt->base.disable_clock = hsw_ddi_disable_clock;

		crt->base.is_clock_enabled = hsw_ddi_is_clock_enabled;



		intel_ddi_buf_trans_init(&crt->base);

	} else {

		if (HAS_PCH_SPLIT(dev_priv)) {

			crt->base.compute_config = pch_crt_compute_config;

drivers/gpu/drm/i915/display/intel_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -163,12 +163,12 @@ static void intel_crtc_free(struct intel_crtc *crtc) 
	kfree(crtc);

}



static void intel_crtc_destroy(struct drm_crtc *crtc)

static void intel_crtc_destroy(struct drm_crtc *_crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc *crtc = to_intel_crtc(_crtc);



	drm_crtc_cleanup(crtc);

	kfree(intel_crtc);

	drm_crtc_cleanup(&crtc->base);

	kfree(crtc);

}



static int intel_crtc_late_register(struct drm_crtc *crtc)

drivers/gpu/drm/i915/display/intel_ddi.c

+95 −115

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_ddi.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ bool hsw_ddi_is_clock_enabled(struct intel_encoder *encoder); 
void hsw_ddi_get_config(struct intel_encoder *encoder,

			struct intel_crtc_state *crtc_state);

struct intel_shared_dpll *icl_ddi_combo_get_pll(struct intel_encoder *encoder);

void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder,

void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder,

				const struct intel_crtc_state *crtc_state);

void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,

			     enum port port);