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

Commit 6426a7b0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes 

Daniel writes:
"Nothing really major at all:
- fixup edp setup sequence (Dave)
- disable sdvo hotplug for real, this is a fixup for a messed-up
  regression fixer (Jani)
- don't expose dysfunctional backlight driver (Jani)
- properly init spinlock (only used by hsw/vlv code) from Alexander
  Shishkin"
along with a couple of more fixes on top.

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: fix up the IBX transcoder B check
  drm/i915: set the right gen3 flip_done mode also at resume
  drm/i915: initialize dpio_lock spin lock
  drm/i915: do not expose a dysfunctional backlight interface to userspace
  drm/i915: only enable sdvo hotplug irq if needed
  drm/i915/edp: get the panel delay before powering up
parents 0bd1189e 75c5da27

drivers/gpu/drm/i915/i915_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -1587,6 +1587,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	spin_lock_init(&dev_priv->irq_lock);

	spin_lock_init(&dev_priv->error_lock);

	spin_lock_init(&dev_priv->rps_lock);

	spin_lock_init(&dev_priv->dpio_lock);



	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))

		dev_priv->num_pipe = 3;

drivers/gpu/drm/i915/i915_irq.c

+0 −3
Original line number Diff line number Diff line
@@ -2700,9 +2700,6 @@ void intel_irq_init(struct drm_device *dev) 
			dev->driver->irq_handler = i8xx_irq_handler;

			dev->driver->irq_uninstall = i8xx_irq_uninstall;

		} else if (INTEL_INFO(dev)->gen == 3) {

			/* IIR "flip pending" means done if this bit is set */

			I915_WRITE(ECOSKPD, _MASKED_BIT_DISABLE(ECO_FLIP_DONE));



			dev->driver->irq_preinstall = i915_irq_preinstall;

			dev->driver->irq_postinstall = i915_irq_postinstall;

			dev->driver->irq_uninstall = i915_irq_uninstall;

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -1376,7 +1376,8 @@ static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv, 
	     "PCH DP (0x%08x) enabled on transcoder %c, should be disabled\n",

	     reg, pipe_name(pipe));



	WARN(HAS_PCH_IBX(dev_priv->dev) && (val & SDVO_PIPE_B_SELECT),

	WARN(HAS_PCH_IBX(dev_priv->dev) && (val & DP_PORT_EN) == 0

	     && (val & DP_PIPEB_SELECT),

	     "IBX PCH dp port still using transcoder B\n");

}
@@ -1388,7 +1389,8 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv, 
	     "PCH HDMI (0x%08x) enabled on transcoder %c, should be disabled\n",

	     reg, pipe_name(pipe));



	WARN(HAS_PCH_IBX(dev_priv->dev) && (val & SDVO_PIPE_B_SELECT),

	WARN(HAS_PCH_IBX(dev_priv->dev) && (val & PORT_ENABLE) == 0

	     && (val & SDVO_PIPE_B_SELECT),

	     "IBX PCH hdmi port still using transcoder B\n");

}

drivers/gpu/drm/i915/intel_dp.c

+7 −4
Original line number Diff line number Diff line
@@ -2533,14 +2533,10 @@ intel_dp_init(struct drm_device *dev, int output_reg) 
			break;

	}



	intel_dp_i2c_init(intel_dp, intel_connector, name);



	/* Cache some DPCD data in the eDP case */

	if (is_edp(intel_dp)) {

		bool ret;

		struct edp_power_seq	cur, vbt;

		u32 pp_on, pp_off, pp_div;

		struct edid *edid;



		pp_on = I915_READ(PCH_PP_ON_DELAYS);

		pp_off = I915_READ(PCH_PP_OFF_DELAYS);
@@ -2591,6 +2587,13 @@ intel_dp_init(struct drm_device *dev, int output_reg) 


		DRM_DEBUG_KMS("backlight on delay %d, off delay %d\n",

			      intel_dp->backlight_on_delay, intel_dp->backlight_off_delay);

	}



	intel_dp_i2c_init(intel_dp, intel_connector, name);



	if (is_edp(intel_dp)) {

		bool ret;

		struct edid *edid;



		ironlake_edp_panel_vdd_on(intel_dp);

		ret = intel_dp_get_dpcd(intel_dp);

drivers/gpu/drm/i915/intel_panel.c

+22 −9
Original line number Diff line number Diff line
@@ -162,19 +162,12 @@ static u32 i915_read_blc_pwm_ctl(struct drm_i915_private *dev_priv) 
	return val;

}



u32 intel_panel_get_max_backlight(struct drm_device *dev)

static u32 _intel_panel_get_max_backlight(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 max;



	max = i915_read_blc_pwm_ctl(dev_priv);

	if (max == 0) {

		/* XXX add code here to query mode clock or hardware clock

		 * and program max PWM appropriately.

		 */

		pr_warn_once("fixme: max PWM is zero\n");

		return 1;

	}



	if (HAS_PCH_SPLIT(dev)) {

		max >>= 16;
@@ -188,6 +181,22 @@ u32 intel_panel_get_max_backlight(struct drm_device *dev) 
			max *= 0xff;

	}



	return max;

}



u32 intel_panel_get_max_backlight(struct drm_device *dev)

{

	u32 max;



	max = _intel_panel_get_max_backlight(dev);

	if (max == 0) {

		/* XXX add code here to query mode clock or hardware clock

		 * and program max PWM appropriately.

		 */

		pr_warn_once("fixme: max PWM is zero\n");

		return 1;

	}



	DRM_DEBUG_DRIVER("max backlight PWM = %d\n", max);

	return max;

}
@@ -424,7 +433,11 @@ int intel_panel_setup_backlight(struct drm_device *dev) 


	memset(&props, 0, sizeof(props));

	props.type = BACKLIGHT_RAW;

	props.max_brightness = intel_panel_get_max_backlight(dev);

	props.max_brightness = _intel_panel_get_max_backlight(dev);

	if (props.max_brightness == 0) {

		DRM_ERROR("Failed to get maximum backlight value\n");

		return -ENODEV;

	}

	dev_priv->backlight =

		backlight_device_register("intel_backlight",

					  &connector->kdev, dev,