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

Commit 3c9fdefe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2018-07-27' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Not much happening this week which is good: two imx display fixes and
  one i915 quirk addition"

* tag 'drm-fixes-2018-07-27' of git://anongit.freedesktop.org/drm/drm:
  drm/i915/glk: Add Quirk for GLK NUC HDMI port issues.
  gpu: ipu-csi: Check for field type alternate
  drm/imx: imx-ldb: check if channel is enabled before printing warning
  drm/imx: imx-ldb: disable LDB on driver bind
parents 49b1622b 050d2a55

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ enum intel_sbi_destination { 
#define QUIRK_BACKLIGHT_PRESENT (1<<3)

#define QUIRK_PIN_SWIZZLED_PAGES (1<<5)

#define QUIRK_INCREASE_T12_DELAY (1<<6)

#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)



struct intel_fbdev;

struct intel_fbc_work;

drivers/gpu/drm/i915/intel_ddi.c

+11 −2
Original line number Diff line number Diff line
@@ -1782,15 +1782,24 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state) 
	I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);

}



void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,

				       enum transcoder cpu_transcoder)

void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state)

{

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

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

	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;

	i915_reg_t reg = TRANS_DDI_FUNC_CTL(cpu_transcoder);

	uint32_t val = I915_READ(reg);



	val &= ~(TRANS_DDI_FUNC_ENABLE | TRANS_DDI_PORT_MASK | TRANS_DDI_DP_VC_PAYLOAD_ALLOC);

	val |= TRANS_DDI_PORT_NONE;

	I915_WRITE(reg, val);



	if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME &&

	    intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {

		DRM_DEBUG_KMS("Quirk Increase DDI disabled time\n");

		/* Quirk time at 100ms for reliable operation */

		msleep(100);

	}

}



int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,

drivers/gpu/drm/i915/intel_display.c

+20 −1
Original line number Diff line number Diff line
@@ -5809,7 +5809,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, 
		intel_ddi_set_vc_payload_alloc(intel_crtc->config, false);



	if (!transcoder_is_dsi(cpu_transcoder))

		intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);

		intel_ddi_disable_transcoder_func(old_crtc_state);



	if (INTEL_GEN(dev_priv) >= 9)

		skylake_scaler_disable(intel_crtc);
@@ -14646,6 +14646,18 @@ static void quirk_increase_t12_delay(struct drm_device *dev) 
	DRM_INFO("Applying T12 delay quirk\n");

}



/*

 * GeminiLake NUC HDMI outputs require additional off time

 * this allows the onboard retimer to correctly sync to signal

 */

static void quirk_increase_ddi_disabled_time(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);



	dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;

	DRM_INFO("Applying Increase DDI Disabled quirk\n");

}



struct intel_quirk {

	int device;

	int subsystem_vendor;
@@ -14732,6 +14744,13 @@ static struct intel_quirk intel_quirks[] = { 


	/* Toshiba Satellite P50-C-18C */

	{ 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },



	/* GeminiLake NUC */

	{ 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },

	{ 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },

	/* ASRock ITX*/

	{ 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },

	{ 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },

};



static void intel_init_quirks(struct drm_device *dev)

drivers/gpu/drm/i915/intel_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -1388,8 +1388,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc, 
void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);

bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);

void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state);

void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,

				       enum transcoder cpu_transcoder);

void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);

void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);

void intel_ddi_disable_pipe_clock(const  struct intel_crtc_state *crtc_state);

struct intel_encoder *

drivers/gpu/drm/imx/imx-ldb.c

+6 −3
Original line number Diff line number Diff line
@@ -612,6 +612,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) 
		return PTR_ERR(imx_ldb->regmap);

	}



	/* disable LDB by resetting the control register to POR default */

	regmap_write(imx_ldb->regmap, IOMUXC_GPR2, 0);



	imx_ldb->dev = dev;



	if (of_id)
@@ -652,14 +655,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) 
		if (ret || i < 0 || i > 1)

			return -EINVAL;



		if (!of_device_is_available(child))

			continue;



		if (dual && i > 0) {

			dev_warn(dev, "dual-channel mode, ignoring second output\n");

			continue;

		}



		if (!of_device_is_available(child))

			continue;



		channel = &imx_ldb->channel[i];

		channel->ldb = imx_ldb;

		channel->chno = i;