| Message ID | 1458287590-23680-1-git-send-email-joonas.lahtinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 18, 2016 at 09:53:08AM +0200, 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> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> That reminds, could you pull https://cgit.freedesktop.org/~ickle/linux-2.6/commit/?h=breadcrumbs&id=8ecc77b5864d4911e9fb9b92be8b2e98c3f2261f [drm/i915: Codify our assumption that the Global GTT is <= 4GiB] into this series? -Chris
On pe, 2016-03-18 at 08:21 +0000, Chris Wilson wrote: > On Fri, Mar 18, 2016 at 09:53:08AM +0200, 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> > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > > That reminds, could you pull > > https://cgit.freedesktop.org/~ickle/linux-2.6/commit/?h=breadcrumbs&id=8ecc77b5864d4911e9fb9b92be8b2e98c3f2261f > [drm/i915: Codify our assumption that the Global GTT is <= 4GiB] > > into this series? Done, sent series v2 with one typo fix and that patch rebased (and tweaked 1ull -> 1ULL). So if somebody would review the new patch, we're good to merge. Regards, Joonas > -Chris >
On Fri, Mar 18, 2016 at 10:54:03AM +0200, Joonas Lahtinen wrote: > On pe, 2016-03-18 at 08:21 +0000, Chris Wilson wrote: > > On Fri, Mar 18, 2016 at 09:53:08AM +0200, 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> > > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > > > > That reminds, could you pull > > > > https://cgit.freedesktop.org/~ickle/linux-2.6/commit/?h=breadcrumbs&id=8ecc77b5864d4911e9fb9b92be8b2e98c3f2261f > > [drm/i915: Codify our assumption that the Global GTT is <= 4GiB] > > > > into this series? > > Done, sent series v2 with one typo fix and that patch rebased (and > tweaked 1ull -> 1ULL). > > So if somebody would review the new patch, we're good to merge. Patch is wrong Chris, you can review it, and then push the entire pile Congrats to volunteering ;-) -Daniel
On Mon, Mar 21, 2016 at 10:35:08AM +0100, Daniel Vetter wrote: > On Fri, Mar 18, 2016 at 10:54:03AM +0200, Joonas Lahtinen wrote: > > On pe, 2016-03-18 at 08:21 +0000, Chris Wilson wrote: > > > On Fri, Mar 18, 2016 at 09:53:08AM +0200, 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> > > > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > > > > > > That reminds, could you pull > > > > > > https://cgit.freedesktop.org/~ickle/linux-2.6/commit/?h=breadcrumbs&id=8ecc77b5864d4911e9fb9b92be8b2e98c3f2261f > > > [drm/i915: Codify our assumption that the Global GTT is <= 4GiB] > > > > > > into this series? > > > > Done, sent series v2 with one typo fix and that patch rebased (and > > tweaked 1ull -> 1ULL). > > > > So if somebody would review the new patch, we're good to merge. > > Patch is wrong Chris, you can review it, and then push the entire pile Which patch? The only one outstanding is my suggestion to add the WARN. -Chris
On Mon, Mar 21, 2016 at 09:39:04AM +0000, Chris Wilson wrote: > On Mon, Mar 21, 2016 at 10:35:08AM +0100, Daniel Vetter wrote: > > On Fri, Mar 18, 2016 at 10:54:03AM +0200, Joonas Lahtinen wrote: > > > On pe, 2016-03-18 at 08:21 +0000, Chris Wilson wrote: > > > > On Fri, Mar 18, 2016 at 09:53:08AM +0200, 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> > > > > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > > > > > > > > That reminds, could you pull > > > > > > > > https://cgit.freedesktop.org/~ickle/linux-2.6/commit/?h=breadcrumbs&id=8ecc77b5864d4911e9fb9b92be8b2e98c3f2261f > > > > [drm/i915: Codify our assumption that the Global GTT is <= 4GiB] > > > > > > > > into this series? > > > > > > Done, sent series v2 with one typo fix and that patch rebased (and > > > tweaked 1ull -> 1ULL). > > > > > > So if somebody would review the new patch, we're good to merge. > > > > Patch is wrong Chris, you can review it, and then push the entire pile > > Which patch? The only one outstanding is my suggestion to add the WARN. s/wrong/from/ ... I can't type :( And yeah I missed that it landed already ;-) Cheers, Daniel
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> 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(-)