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

Commit 5b78cb66 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2015-09-02' of... 

Merge tag 'drm-intel-next-fixes-2015-09-02' of git://anongit.freedesktop.org/drm-intel into drm-next

i915 display fixes headed for v4.3. Mostly SKL, but some regression
fixes too.

* tag 'drm-intel-next-fixes-2015-09-02' of git://anongit.freedesktop.org/drm-intel:
  i915: Set ddi_pll_sel in DP MST path
  drm/i915: Don't use link_bw for PLL setup
  drm/i915: Preserve SSC earlier
  drm/i915/skl: Adding DDI_E power well domain
  drm/i915: eDP can be present on DDI-E
  drm/i915/skl: Enable DDI-E
  drm/i915: Enable HDMI on DDI-E
  drm/i915: apply the PCI_D0/D3 hibernation workaround everywhere on pre GEN6
  drm/i915: Check DP link status on long hpd too
  drm/i915: set CDCLK if DPLL0 enabled during resuming from S3
parents aed160ea 6fa2d197

drivers/gpu/drm/i915/i915_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -2562,6 +2562,8 @@ static const char *power_domain_str(enum intel_display_power_domain domain) 
		return "PORT_DDI_D_2_LANES";

	case POWER_DOMAIN_PORT_DDI_D_4_LANES:

		return "PORT_DDI_D_4_LANES";

	case POWER_DOMAIN_PORT_DDI_E_2_LANES:

		return "PORT_DDI_E_2_LANES";

	case POWER_DOMAIN_PORT_DSI:

		return "PORT_DSI";

	case POWER_DOMAIN_PORT_CRT:

drivers/gpu/drm/i915/i915_drv.c

+9 −6
Original line number Diff line number Diff line
@@ -662,15 +662,18 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) 


	pci_disable_device(drm_dev->pdev);

	/*

	 * During hibernation on some GEN4 platforms the BIOS may try to access

	 * During hibernation on some platforms the BIOS may try to access

	 * the device even though it's already in D3 and hang the machine. So

	 * leave the device in D0 on those platforms and hope the BIOS will

	 * power down the device properly. Platforms where this was seen:

	 * Lenovo Thinkpad X301, X61s

	 * power down the device properly. The issue was seen on multiple old

	 * GENs with different BIOS vendors, so having an explicit blacklist

	 * is inpractical; apply the workaround on everything pre GEN6. The

	 * platforms where the issue was seen:

	 * Lenovo Thinkpad X301, X61s, X60, T60, X41

	 * Fujitsu FSC S7110

	 * Acer Aspire 1830T

	 */

	if (!(hibernation &&

	      drm_dev->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO &&

	      INTEL_INFO(dev_priv)->gen == 4))

	if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))

		pci_set_power_state(drm_dev->pdev, PCI_D3hot);



	return 0;

drivers/gpu/drm/i915/i915_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_PORT_DDI_C_4_LANES,

	POWER_DOMAIN_PORT_DDI_D_2_LANES,

	POWER_DOMAIN_PORT_DDI_D_4_LANES,

	POWER_DOMAIN_PORT_DDI_E_2_LANES,

	POWER_DOMAIN_PORT_DSI,

	POWER_DOMAIN_PORT_CRT,

	POWER_DOMAIN_PORT_OTHER,
@@ -1416,6 +1417,10 @@ enum modeset_restore { 
#define DP_AUX_C 0x20

#define DP_AUX_D 0x30



#define DDC_PIN_B  0x05

#define DDC_PIN_C  0x04

#define DDC_PIN_D  0x06



struct ddi_vbt_port_info {

	/*

	 * This is an index in the HDMI/DVI DDI buffer translation table.
@@ -1430,6 +1435,7 @@ struct ddi_vbt_port_info { 
	uint8_t supports_dp:1;



	uint8_t alternate_aux_channel;

	uint8_t alternate_ddc_pin;



	uint8_t dp_boost_level;

	uint8_t hdmi_boost_level;

drivers/gpu/drm/i915/intel_bios.c

+28 −11
Original line number Diff line number Diff line
@@ -905,23 +905,23 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
	uint8_t hdmi_level_shift;

	int i, j;

	bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;

	uint8_t aux_channel;

	uint8_t aux_channel, ddc_pin;

	/* Each DDI port can have more than one value on the "DVO Port" field,

	 * so look for all the possible values for each port and abort if more

	 * than one is found. */

	int dvo_ports[][2] = {

		{DVO_PORT_HDMIA, DVO_PORT_DPA},

		{DVO_PORT_HDMIB, DVO_PORT_DPB},

		{DVO_PORT_HDMIC, DVO_PORT_DPC},

		{DVO_PORT_HDMID, DVO_PORT_DPD},

		{DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ },

	int dvo_ports[][3] = {

		{DVO_PORT_HDMIA, DVO_PORT_DPA, -1},

		{DVO_PORT_HDMIB, DVO_PORT_DPB, -1},

		{DVO_PORT_HDMIC, DVO_PORT_DPC, -1},

		{DVO_PORT_HDMID, DVO_PORT_DPD, -1},

		{DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE},

	};



	/* Find the child device to use, abort if more than one found. */

	for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {

		it = dev_priv->vbt.child_dev + i;



		for (j = 0; j < 2; j++) {

		for (j = 0; j < 3; j++) {

			if (dvo_ports[port][j] == -1)

				break;
@@ -939,6 +939,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
		return;



	aux_channel = child->raw[25];

	ddc_pin = child->common.ddc_pin;



	is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;

	is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
@@ -970,11 +971,27 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
		DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));



	if (is_dvi) {

		if (child->common.ddc_pin == 0x05 && port != PORT_B)

		if (port == PORT_E) {

			info->alternate_ddc_pin = ddc_pin;

			/* if DDIE share ddc pin with other port, then

			 * dvi/hdmi couldn't exist on the shared port.

			 * Otherwise they share the same ddc bin and system

			 * couldn't communicate with them seperately. */

			if (ddc_pin == DDC_PIN_B) {

				dev_priv->vbt.ddi_port_info[PORT_B].supports_dvi = 0;

				dev_priv->vbt.ddi_port_info[PORT_B].supports_hdmi = 0;

			} else if (ddc_pin == DDC_PIN_C) {

				dev_priv->vbt.ddi_port_info[PORT_C].supports_dvi = 0;

				dev_priv->vbt.ddi_port_info[PORT_C].supports_hdmi = 0;

			} else if (ddc_pin == DDC_PIN_D) {

				dev_priv->vbt.ddi_port_info[PORT_D].supports_dvi = 0;

				dev_priv->vbt.ddi_port_info[PORT_D].supports_hdmi = 0;

			}

		} else if (ddc_pin == DDC_PIN_B && port != PORT_B)

			DRM_DEBUG_KMS("Unexpected DDC pin for port B\n");

		if (child->common.ddc_pin == 0x04 && port != PORT_C)

		else if (ddc_pin == DDC_PIN_C && port != PORT_C)

			DRM_DEBUG_KMS("Unexpected DDC pin for port C\n");

		if (child->common.ddc_pin == 0x06 && port != PORT_D)

		else if (ddc_pin == DDC_PIN_D && port != PORT_D)

			DRM_DEBUG_KMS("Unexpected DDC pin for port D\n");

	}

drivers/gpu/drm/i915/intel_bios.h

+2 −5
Original line number Diff line number Diff line
@@ -758,11 +758,6 @@ int intel_parse_bios(struct drm_device *dev); 
#define		DVO_C		2

#define		DVO_D		3



/* define the PORT for DP output type */

#define		PORT_IDPB	7

#define		PORT_IDPC	8

#define		PORT_IDPD	9



/* Possible values for the "DVO Port" field for versions >= 155: */

#define DVO_PORT_HDMIA	0

#define DVO_PORT_HDMIB	1
@@ -775,6 +770,8 @@ int intel_parse_bios(struct drm_device *dev); 
#define DVO_PORT_DPC	8

#define DVO_PORT_DPD	9

#define DVO_PORT_DPA	10

#define DVO_PORT_DPE	11

#define DVO_PORT_HDMIE	12

#define DVO_PORT_MIPIA	21

#define DVO_PORT_MIPIB	22

#define DVO_PORT_MIPIC	23