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

Commit 71404e8a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2016-07-14' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

I've also realized that a pile of hang fixes for kbl landed in next, and
no one thought of backporting it to 4.7 - kbl has lost prelim_hw_support
tagging in 4.7-rc1 already. Mika is prepping a topic branch for those,
will send you a separate pull request since it's quite a bit (but should
be all well restricted to kbl code, so similar to polaris in amdgpu).

* tag 'drm-intel-fixes-2016-07-14' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Ignore panel type from OpRegion on SKL
  drm/i915: Update ifdeffery for mutex->owner
parents da031899 aeddda06

drivers/gpu/drm/i915/i915_gem_shrinker.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task) 
	if (!mutex_is_locked(mutex))

		return false;



#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)

#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)

	return mutex->owner == task;

#else

	/* Since UP may be pre-empted, we cannot assume that we own the lock */

drivers/gpu/drm/i915/intel_opregion.c

+11 −0
Original line number Diff line number Diff line
@@ -1038,5 +1038,16 @@ intel_opregion_get_panel_type(struct drm_device *dev) 
		return -ENODEV;

	}



	/*

	 * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us

	 * low vswing for eDP, whereas the VBT panel type (2) gives us normal

	 * vswing instead. Low vswing results in some display flickers, so

	 * let's simply ignore the OpRegion panel type on SKL for now.

	 */

	if (IS_SKYLAKE(dev)) {

		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);

		return -ENODEV;

	}



	return ret - 1;

}