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

Commit 5fe220a1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'gvt-fixes-2017-07-26' of https://github.com/01org/gvt-linux into drm-intel-fixes 



gvt-fixes-2017-07-26

- Turn on KBL support for more SKUs (Jianjun)
- Fix vblank timer close bug (Fred)

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170726075621.hrauvik62gi2jecj@zhen-hp.sh.intel.com
parents e9ba4032 26a201a2

drivers/gpu/drm/i915/gvt/display.c

+11 −11
Original line number Diff line number Diff line
@@ -323,27 +323,27 @@ void intel_gvt_check_vblank_emulation(struct intel_gvt *gvt) 
{

	struct intel_gvt_irq *irq = &gvt->irq;

	struct intel_vgpu *vgpu;

	bool have_enabled_pipe = false;

	int pipe, id;



	if (WARN_ON(!mutex_is_locked(&gvt->lock)))

		return;



	hrtimer_cancel(&irq->vblank_timer.timer);



	for_each_active_vgpu(gvt, vgpu, id) {

		for (pipe = 0; pipe < I915_MAX_PIPES; pipe++) {

			have_enabled_pipe =

				pipe_is_enabled(vgpu, pipe);

			if (have_enabled_pipe)

				break;

			if (pipe_is_enabled(vgpu, pipe))

				goto out;

		}

	}



	if (have_enabled_pipe)

	/* all the pipes are disabled */

	hrtimer_cancel(&irq->vblank_timer.timer);

	return;



out:

	hrtimer_start(&irq->vblank_timer.timer,

		ktime_add_ns(ktime_get(), irq->vblank_timer.period),

		HRTIMER_MODE_ABS);



}



static void emulate_vblank_on_pipe(struct intel_vgpu *vgpu, int pipe)

drivers/gpu/drm/i915/intel_gvt.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static bool is_supported_device(struct drm_i915_private *dev_priv) 
		return true;

	if (IS_SKYLAKE(dev_priv))

		return true;

	if (IS_KABYLAKE(dev_priv) && INTEL_DEVID(dev_priv) == 0x591D)

	if (IS_KABYLAKE(dev_priv))

		return true;

	return false;

}