| Message ID | 1449514270-15171-4-git-send-email-wayne.boyer@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 07, 2015 at 10:51:08AM -0800, Wayne Boyer wrote: > 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> > --- > drivers/gpu/drm/i915/i915_gem.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index b722a61..4556500 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4838,14 +4838,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"); > - } > - Yeah, this old thing shouldn't be needed. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > if (!i915.enable_execlists) { > dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission; > dev_priv->gt.init_rings = i915_gem_init_rings; > -- > 2.6.3
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b722a61..4556500 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4838,14 +4838,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;
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> --- drivers/gpu/drm/i915/i915_gem.c | 8 -------- 1 file changed, 8 deletions(-)