| Message ID | 1372935988-5075-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 04, 2013 at 01:06:28PM +0200, Daniel Vetter wrote: > A magic -1 is a obscure, especially since it's actually passed as an > unsigned, so depens upon the magic sign extension rules in C. This has s/depens/depends/. > been added in > > commit 3727d55e4d85836aa6cb759a965daaef88074150 > Author: Jesse Barnes <jbarnes@virtuousgeek.org> > Date: Wed May 8 10:45:14 2013 -0700 > > drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2 > > Use a proper #define instead. Spotted while reviewing Ben's > drm_mm_create_block changes. > > v2: Cast the constant to u32 since otherwise we again have a type > mismatch. Suggested by Chris Wilson. > > Cc: Ben Widawsky <ben@bwidawsk.net> > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Thu, Jul 04, 2013 at 12:31:37PM +0100, Chris Wilson wrote: > On Thu, Jul 04, 2013 at 01:06:28PM +0200, Daniel Vetter wrote: > > A magic -1 is a obscure, especially since it's actually passed as an > > unsigned, so depens upon the magic sign extension rules in C. This has > > s/depens/depends/. Fixed ... > > > been added in > > > > commit 3727d55e4d85836aa6cb759a965daaef88074150 > > Author: Jesse Barnes <jbarnes@virtuousgeek.org> > > Date: Wed May 8 10:45:14 2013 -0700 > > > > drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2 > > > > Use a proper #define instead. Spotted while reviewing Ben's > > drm_mm_create_block changes. > > > > v2: Cast the constant to u32 since otherwise we again have a type > > mismatch. Suggested by Chris Wilson. > > > > Cc: Ben Widawsky <ben@bwidawsk.net> > > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> ... and merged, thanks for the review. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 102e6b2..86667e0 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1197,6 +1197,7 @@ enum hdmi_force_audio { }; #define I915_GTT_RESERVED ((struct drm_mm_node *)0x1) +#define I915_GTT_OFFSET_NONE ((u32)-1) struct drm_i915_gem_object_ops { /* Interface between the GEM object and its backing storage. diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 8e02344..0f18d75 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -360,7 +360,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, } /* Some objects just need physical mem from stolen space */ - if (gtt_offset == -1) + if (gtt_offset == I915_GTT_OFFSET_NONE) return obj; /* To simplify the initialisation sequence between KMS and GTT, diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5b4ade6..bbf0531 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3481,7 +3481,7 @@ static void valleyview_setup_pctx(struct drm_device *dev) pcbr_offset = (pcbr & (~4095)) - dev_priv->mm.stolen_base; pctx = i915_gem_object_create_stolen_for_preallocated(dev_priv->dev, pcbr_offset, - -1, + I915_GTT_OFFSET_NONE, pctx_size); goto out; }
A magic -1 is a obscure, especially since it's actually passed as an unsigned, so depens upon the magic sign extension rules in C. This has been added in commit 3727d55e4d85836aa6cb759a965daaef88074150 Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Wed May 8 10:45:14 2013 -0700 drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation v2 Use a proper #define instead. Spotted while reviewing Ben's drm_mm_create_block changes. v2: Cast the constant to u32 since otherwise we again have a type mismatch. Suggested by Chris Wilson. Cc: Ben Widawsky <ben@bwidawsk.net> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)