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

Commit e8285cec authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2016-08-05' of... 

Merge tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel into drm-next

3 intel fixes.

* tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/fbdev: Check for the framebuffer before use
  drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB
  drm/i915: Wait up to 3ms for the pcu to ack the cdclk change request on SKL
parents 5c6c201c c45eb4fe

drivers/gpu/drm/i915/intel_display.c

+1 −9
Original line number Diff line number Diff line
@@ -5691,15 +5691,7 @@ static bool skl_cdclk_pcu_ready(struct drm_i915_private *dev_priv) 


static bool skl_cdclk_wait_for_pcu_ready(struct drm_i915_private *dev_priv)

{

	unsigned int i;



	for (i = 0; i < 15; i++) {

		if (skl_cdclk_pcu_ready(dev_priv))

			return true;

		udelay(10);

	}



	return false;

	return _wait_for(skl_cdclk_pcu_ready(dev_priv), 3000, 10) == 0;

}



static void skl_set_cdclk(struct drm_i915_private *dev_priv, int cdclk, int vco)

drivers/gpu/drm/i915/intel_fbdev.c

+11 −14
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous 
	struct intel_fbdev *ifbdev = dev_priv->fbdev;

	struct fb_info *info;



	if (!ifbdev)

	if (!ifbdev || !ifbdev->fb)

		return;



	info = ifbdev->helper.fbdev;
@@ -827,31 +827,28 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous 


void intel_fbdev_output_poll_changed(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	if (dev_priv->fbdev)

		drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);

	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;



	if (ifbdev && ifbdev->fb)

		drm_fb_helper_hotplug_event(&ifbdev->helper);

}



void intel_fbdev_restore_mode(struct drm_device *dev)

{

	int ret;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_fbdev *ifbdev = dev_priv->fbdev;

	struct drm_fb_helper *fb_helper;

	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;



	if (!ifbdev)

		return;



	intel_fbdev_sync(ifbdev);

	if (!ifbdev->fb)

		return;



	fb_helper = &ifbdev->helper;



	ret = drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);

	if (ret) {

	if (drm_fb_helper_restore_fbdev_mode_unlocked(&ifbdev->helper)) {

		DRM_DEBUG("failed to restore crtc mode\n");

	} else {

		mutex_lock(&fb_helper->dev->struct_mutex);

		mutex_lock(&dev->struct_mutex);

		intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);

		mutex_unlock(&fb_helper->dev->struct_mutex);

		mutex_unlock(&dev->struct_mutex);

	}

}

drivers/gpu/drm/i915/intel_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -4892,7 +4892,8 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv) 
		else

			gen6_set_rps(dev_priv, dev_priv->rps.idle_freq);

		dev_priv->rps.last_adj = 0;

		I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);

		I915_WRITE(GEN6_PMINTRMSK,

			   gen6_sanitize_rps_pm_mask(dev_priv, ~0));

	}

	mutex_unlock(&dev_priv->rps.hw_lock);