| Message ID | 1458290579-27783-1-git-send-email-joonas.lahtinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18/03/16 08:42, Joonas Lahtinen wrote: > Reference variable value from pointer, not assumed pointer destination. > > Since: > > commit c44ef60e437019b8ca1dab8b4d2e8761fd4ce1e9 > Author: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Date: Thu Jun 25 18:35:05 2015 +0300 > > drm/i915/gtt: Allow >= 4GB sizes for vm. > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 9c752fe..5c90952 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -3103,8 +3103,7 @@ static int gen6_gmch_probe(struct drm_device *dev, > * a coarse sanity check. > */ > if ((*mappable_end < (64<<20) || (*mappable_end > (512<<20)))) { > - DRM_ERROR("Unknown GMADR size (%llx)\n", > - dev_priv->gtt.mappable_end); > + DRM_ERROR("Unknown GMADR size (%llx)\n", *mappable_end); > return -ENXIO; > } > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
On pe, 2016-03-18 at 12:11 +0000, Patchwork wrote: > == Series Details == > > Series: series starting with [v2,1/4] drm/i915/gtt: Reference mappable_end variable from pointer > URL : https://patchwork.freedesktop.org/series/4620/ > State : failure > > == Summary == > > Series 4620v1 Series without cover letter > http://patchwork.freedesktop.org/api/1.0/series/4620/revisions/1/mbox/ > > Test gem_mmap_gtt: > Subgroup basic-write-gtt-no-prefault: > dmesg-warn -> PASS (bsw-nuc-2) > Test kms_flip: > Subgroup basic-flip-vs-dpms: > pass -> DMESG-WARN (hsw-brixbox) HDA problem > Subgroup basic-flip-vs-wf_vblank: > dmesg-warn -> PASS (hsw-brixbox) > pass -> DMESG-WARN (bdw-ultra) HDA problem too. > Subgroup basic-plain-flip: > dmesg-warn -> PASS (hsw-brixbox) > Test pm_rpm: > Subgroup basic-pci-d3-state: > dmesg-fail -> FAIL (snb-x220t) https://bugs.freedesktop.org/show_bug.cgi?id=94163 > dmesg-warn -> PASS (snb-dellxps) > Subgroup basic-rte: > dmesg-warn -> PASS (bsw-nuc-2) > pass -> DMESG-WARN (snb-dellxps) https://bugs.freedesktop.org/show_bug.cgi?id=94349 So, merging in the series. > > bdw-nuci7 total:194 pass:181 dwarn:1 dfail:0 fail:0 skip:12 > bdw-ultra total:194 pass:171 dwarn:2 dfail:0 fail:0 skip:21 > bsw-nuc-2 total:194 pass:156 dwarn:1 dfail:0 fail:0 skip:37 > hsw-brixbox total:194 pass:170 dwarn:2 dfail:0 fail:0 skip:22 > hsw-gt2 total:194 pass:176 dwarn:1 dfail:0 fail:0 skip:17 > ivb-t430s total:194 pass:168 dwarn:1 dfail:0 fail:0 skip:25 > skl-i5k-2 total:194 pass:170 dwarn:1 dfail:0 fail:0 skip:23 > skl-i7k-2 total:194 pass:170 dwarn:1 dfail:0 fail:0 skip:23 > skl-nuci5 total:194 pass:182 dwarn:1 dfail:0 fail:0 skip:11 > snb-dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:34 > snb-x220t total:194 pass:158 dwarn:2 dfail:0 fail:1 skip:33 > > Results at /archive/results/CI_IGT_test/Patchwork_1641/ > > 851d270da650c16883e87bdaad7ca8b37ccbdea3 drm-intel-nightly: 2016y-03m-18d-11h-13m-55s UTC integration manifest > c40d12b65ef06d0af913c73d77260bcf2d10a9c7 drm/i915: Codify our assumption that the Global GTT is <= 4GiB > eee60d55ce416f67c8000b69dea7bb098753593b drm/i915/gtt: Clean up GGTT probing code > 33074c8e629ff0374da6cbb656433bd82a708c20 drm/i915: Rename dev_priv->gtt to dev_priv->ggtt > 645ac6515415f359a5d43741a4eb87d8c048554e drm/i915/gtt: Reference mappable_end variable from pointer >
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 9c752fe..5c90952 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3103,8 +3103,7 @@ static int gen6_gmch_probe(struct drm_device *dev, * a coarse sanity check. */ if ((*mappable_end < (64<<20) || (*mappable_end > (512<<20)))) { - DRM_ERROR("Unknown GMADR size (%llx)\n", - dev_priv->gtt.mappable_end); + DRM_ERROR("Unknown GMADR size (%llx)\n", *mappable_end); return -ENXIO; }
Reference variable value from pointer, not assumed pointer destination. Since: commit c44ef60e437019b8ca1dab8b4d2e8761fd4ce1e9 Author: Mika Kuoppala <mika.kuoppala@linux.intel.com> Date: Thu Jun 25 18:35:05 2015 +0300 drm/i915/gtt: Allow >= 4GB sizes for vm. Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)