Commit bf6ce93a authored Dec 07, 2015 by Wayne Boyer Committed by Daniel Vetter Dec 10, 2015

drm/i915: Remove VLV A0 hack



Do some further clean up based on the initial review of
drm/i915: Separate cherryview from valleyview.

In this case remove a hack for VLV A0.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449514270-15171-4-git-send-email-wayne.boyer@intel.com


Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

parent a7e478c7

drivers/gpu/drm/i915/i915_gem.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -4854,14 +4854,6 @@ int i915_gem_init(struct drm_device *dev)

		mutex_lock(&dev->struct_mutex);

		if (IS_VALLEYVIEW(dev) \|\| IS_CHERRYVIEW(dev)) {
		/* VLVA0 (potential hack), BIOS isn't actually waking us */
		I915_WRITE(VLV_GTLC_WAKE_CTRL, VLV_GTLC_ALLOWWAKEREQ);
		if (wait_for((I915_READ(VLV_GTLC_PW_STATUS) &
		VLV_GTLC_ALLOWWAKEACK), 10))
		DRM_DEBUG_DRIVER("allow wake ack timed out\n");
		}

		if (!i915.enable_execlists) {
		dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission;
		dev_priv->gt.init_rings = i915_gem_init_rings;