On Mon, 19 May 2014 19:23:22 +0300 ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > There are comments in the gen4-5 reset functions stating that we can't > reset render and media without also doing a display reset. But that's > exactly what the code does, ie. we don't perform a display reset. Drop > the bogus comments. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_uncore.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index 27fe2df..0e333f2 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -978,7 +978,6 @@ static int i965_do_reset(struct drm_device *dev) > if (ret) > return ret; > > - /* We can't reset render&media without also resetting display ... */ > pci_write_config_byte(dev->pdev, I965_GDRST, > GRDOM_MEDIA | GRDOM_RESET_ENABLE); > > @@ -1005,7 +1004,6 @@ static int ironlake_do_reset(struct drm_device *dev) > if (ret) > return ret; > > - /* We can't reset render&media without also resetting display ... */ > gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR); > gdrst &= ~GRDOM_MASK; > I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, Reviewed-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> -- Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx