Message ID | 1362175722-9281-13-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Mar 01, 2013 at 02:08:29PM -0800, Jesse Barnes wrote: > It uses the same bit definitions. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Matches what I see in the docs. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 926a1e2..2d7d3a9 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -752,7 +752,7 @@ static int gen6_gmch_probe(struct drm_device *dev, > pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl); > gtt_size = gen6_get_total_gtt_size(snb_gmch_ctl); > > - if (IS_GEN7(dev)) > + if (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) > *stolen = gen7_get_stolen_size(snb_gmch_ctl); > else > *stolen = gen6_get_stolen_size(snb_gmch_ctl); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Mar 06, 2013 at 08:45:47PM +0200, Ville Syrjälä wrote: > On Fri, Mar 01, 2013 at 02:08:29PM -0800, Jesse Barnes wrote: > > It uses the same bit definitions. > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > Matches what I see in the docs. > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 926a1e2..2d7d3a9 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -752,7 +752,7 @@ static int gen6_gmch_probe(struct drm_device *dev, pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl); gtt_size = gen6_get_total_gtt_size(snb_gmch_ctl); - if (IS_GEN7(dev)) + if (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) *stolen = gen7_get_stolen_size(snb_gmch_ctl); else *stolen = gen6_get_stolen_size(snb_gmch_ctl);
It uses the same bit definitions. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)