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

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

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915/lvds: Only act on lid notify when the device is on
  drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"
  drm/i915: Only enable the plane after setting the fb base (pre-ILK)
  drm/i915/dp: Be paranoid in case we disable a DP before it is attached
  drm/i915: Release object along create user fb error path
parents a09a79f6 2fb4e61d

drivers/gpu/drm/i915/intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -5154,8 +5154,6 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 


	I915_WRITE(DSPCNTR(plane), dspcntr);

	POSTING_READ(DSPCNTR(plane));

	if (!HAS_PCH_SPLIT(dev))

		intel_enable_plane(dev_priv, plane, pipe);



	ret = intel_pipe_set_base(crtc, x, y, old_fb);
@@ -5605,9 +5603,9 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc) 
	intel_clock_t clock;



	if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)

		fp = FP0(pipe);

		fp = I915_READ(FP0(pipe));

	else

		fp = FP1(pipe);

		fp = I915_READ(FP1(pipe));



	clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;

	if (IS_PINEVIEW(dev)) {
@@ -6579,8 +6577,10 @@ intel_user_framebuffer_create(struct drm_device *dev, 
		return ERR_PTR(-ENOENT);



	intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);

	if (!intel_fb)

	if (!intel_fb) {

		drm_gem_object_unreference_unlocked(&obj->base);

		return ERR_PTR(-ENOMEM);

	}



	ret = intel_framebuffer_init(dev, intel_fb, mode_cmd, obj);

	if (ret) {

drivers/gpu/drm/i915/intel_dp.c

+15 −2
Original line number Diff line number Diff line
@@ -1470,7 +1470,8 @@ intel_dp_link_down(struct intel_dp *intel_dp) 


	if (!HAS_PCH_CPT(dev) &&

	    I915_READ(intel_dp->output_reg) & DP_PIPEB_SELECT) {

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

		struct drm_crtc *crtc = intel_dp->base.base.crtc;



		/* Hardware workaround: leaving our transcoder select

		 * set to transcoder B while it's off will prevent the

		 * corresponding HDMI output on transcoder A.
@@ -1485,7 +1486,19 @@ intel_dp_link_down(struct intel_dp *intel_dp) 
		/* Changes to enable or select take place the vblank

		 * after being written.

		 */

		intel_wait_for_vblank(dev, intel_crtc->pipe);

		if (crtc == NULL) {

			/* We can arrive here never having been attached

			 * to a CRTC, for instance, due to inheriting

			 * random state from the BIOS.

			 *

			 * If the pipe is not running, play safe and

			 * wait for the clocks to stabilise before

			 * continuing.

			 */

			POSTING_READ(intel_dp->output_reg);

			msleep(50);

		} else

			intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe);

	}



	I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);

drivers/gpu/drm/i915/intel_lvds.c

+3 −0
Original line number Diff line number Diff line
@@ -539,6 +539,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, 
	struct drm_device *dev = dev_priv->dev;

	struct drm_connector *connector = dev_priv->int_lvds_connector;



	if (dev->switch_power_state != DRM_SWITCH_POWER_ON)

		return NOTIFY_OK;



	/*

	 * check and update the status of LVDS connector after receiving

	 * the LID nofication event.