Commit caa55235 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 - i915 fixes: a few display regressions
 - vmwgfx: possible loop forever fix
 - nouveau: one userspace interface fix

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/core: don't leak oclass type bits to user
  drm/i915: Fix lock dropping in intel_tv_detect()
  drm/i915: handle G45/GM45 pulse detection connected state.
  drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
  drm/vmwgfx: Fix an incorrect OOM return value
  drm/i915: Remove bogus __init annotation from DMI callbacks
  drm/i915: don't warn if backlight unexpectedly enabled
  drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to haswell_crtc_disable()
  drm/i915: fix plane/cursor handling when runtime suspended
  drm/i915: Ignore VBT backlight presence check on Acer C720 (4005U)
parents b7fece1b 68c78bd6

drivers/gpu/drm/i915/intel_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) 
	}

}



static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)

static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)

{

	DRM_DEBUG_KMS("Falling back to manually reading VBT from "

		      "VBIOS ROM for %s\n",

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { 
	.destroy = intel_encoder_destroy,

};



static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)

static int intel_no_crt_dmi_callback(const struct dmi_system_id *id)

{

	DRM_INFO("Skipping CRT initialization for %s\n", id->ident);

	return 1;

drivers/gpu/drm/i915/intel_display.c

+30 −4
Original line number Diff line number Diff line
@@ -2233,6 +2233,15 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
	if (need_vtd_wa(dev) && alignment < 256 * 1024)

		alignment = 256 * 1024;



	/*

	 * Global gtt pte registers are special registers which actually forward

	 * writes to a chunk of system memory. Which means that there is no risk

	 * that the register values disappear as soon as we call

	 * intel_runtime_pm_put(), so it is correct to wrap only the

	 * pin/unpin/fence and not more.

	 */

	intel_runtime_pm_get(dev_priv);



	dev_priv->mm.interruptible = false;

	ret = i915_gem_object_pin_to_display_plane(obj, alignment, pipelined);

	if (ret)
@@ -2250,12 +2259,14 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
	i915_gem_object_pin_fence(obj);



	dev_priv->mm.interruptible = true;

	intel_runtime_pm_put(dev_priv);

	return 0;



err_unpin:

	i915_gem_object_unpin_from_display_plane(obj);

err_interruptible:

	dev_priv->mm.interruptible = true;

	intel_runtime_pm_put(dev_priv);

	return ret;

}
@@ -4188,10 +4199,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) 
		intel_set_pch_fifo_underrun_reporting(dev, pipe, false);



	intel_disable_pipe(dev_priv, pipe);



	if (intel_crtc->config.dp_encoder_is_mst)

		intel_ddi_set_vc_payload_alloc(crtc, false);



	ironlake_pfit_disable(intel_crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)
@@ -4256,6 +4263,9 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) 
		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, false);

	intel_disable_pipe(dev_priv, pipe);



	if (intel_crtc->config.dp_encoder_is_mst)

		intel_ddi_set_vc_payload_alloc(crtc, false);



	intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);



	ironlake_pfit_disable(intel_crtc);
@@ -8240,6 +8250,15 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc, 
			goto fail_locked;

		}



		/*

		 * Global gtt pte registers are special registers which actually

		 * forward writes to a chunk of system memory. Which means that

		 * there is no risk that the register values disappear as soon

		 * as we call intel_runtime_pm_put(), so it is correct to wrap

		 * only the pin/unpin/fence and not more.

		 */

		intel_runtime_pm_get(dev_priv);



		/* Note that the w/a also requires 2 PTE of padding following

		 * the bo. We currently fill all unused PTE with the shadow

		 * page and so we should always have valid PTE following the
@@ -8252,16 +8271,20 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc, 
		ret = i915_gem_object_pin_to_display_plane(obj, alignment, NULL);

		if (ret) {

			DRM_DEBUG_KMS("failed to move cursor bo into the GTT\n");

			intel_runtime_pm_put(dev_priv);

			goto fail_locked;

		}



		ret = i915_gem_object_put_fence(obj);

		if (ret) {

			DRM_DEBUG_KMS("failed to release fence for cursor");

			intel_runtime_pm_put(dev_priv);

			goto fail_unpin;

		}



		addr = i915_gem_obj_ggtt_offset(obj);



		intel_runtime_pm_put(dev_priv);

	} else {

		int align = IS_I830(dev) ? 16 * 1024 : 256;

		ret = i915_gem_object_attach_phys(obj, align);
@@ -12481,6 +12504,9 @@ static struct intel_quirk intel_quirks[] = { 
	/* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */

	{ 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },



	/* Acer C720 Chromebook (Core i3 4005U) */

	{ 0x0a16, 0x1025, 0x0a11, quirk_backlight_present },



	/* Toshiba CB35 Chromebook (Celeron 2955U) */

	{ 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },

drivers/gpu/drm/i915/intel_dp.c

+37 −18
Original line number Diff line number Diff line
@@ -3661,24 +3661,12 @@ ironlake_dp_detect(struct intel_dp *intel_dp) 
	return intel_dp_detect_dpcd(intel_dp);

}



static enum drm_connector_status

g4x_dp_detect(struct intel_dp *intel_dp)

static int g4x_digital_port_connected(struct drm_device *dev,

				       struct intel_digital_port *intel_dig_port)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);

	uint32_t bit;



	/* Can't disconnect eDP, but you can close the lid... */

	if (is_edp(intel_dp)) {

		enum drm_connector_status status;



		status = intel_panel_detect(dev);

		if (status == connector_status_unknown)

			status = connector_status_connected;

		return status;

	}



	if (IS_VALLEYVIEW(dev)) {

		switch (intel_dig_port->port) {

		case PORT_B:
@@ -3691,7 +3679,7 @@ g4x_dp_detect(struct intel_dp *intel_dp) 
			bit = PORTD_HOTPLUG_LIVE_STATUS_VLV;

			break;

		default:

			return connector_status_unknown;

			return -EINVAL;

		}

	} else {

		switch (intel_dig_port->port) {
@@ -3705,11 +3693,36 @@ g4x_dp_detect(struct intel_dp *intel_dp) 
			bit = PORTD_HOTPLUG_LIVE_STATUS_G4X;

			break;

		default:

			return connector_status_unknown;

			return -EINVAL;

		}

	}



	if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0)

		return 0;

	return 1;

}



static enum drm_connector_status

g4x_dp_detect(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);

	int ret;



	/* Can't disconnect eDP, but you can close the lid... */

	if (is_edp(intel_dp)) {

		enum drm_connector_status status;



		status = intel_panel_detect(dev);

		if (status == connector_status_unknown)

			status = connector_status_connected;

		return status;

	}



	ret = g4x_digital_port_connected(dev, intel_dig_port);

	if (ret == -EINVAL)

		return connector_status_unknown;

	else if (ret == 0)

		return connector_status_disconnected;



	return intel_dp_detect_dpcd(intel_dp);
@@ -4066,8 +4079,14 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) 
	intel_display_power_get(dev_priv, power_domain);



	if (long_hpd) {



		if (HAS_PCH_SPLIT(dev)) {

			if (!ibx_digital_port_connected(dev_priv, intel_dig_port))

				goto mst_fail;

		} else {

			if (g4x_digital_port_connected(dev, intel_dig_port) != 1)

				goto mst_fail;

		}



		if (!intel_dp_get_dpcd(intel_dp)) {

			goto mst_fail;

drivers/gpu/drm/i915/intel_lvds.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = { 
	.destroy = intel_encoder_destroy,

};



static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)

static int intel_no_lvds_dmi_callback(const struct dmi_system_id *id)

{

	DRM_INFO("Skipping LVDS initialization for %s\n", id->ident);

	return 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE