| Message ID | 1361309508-4901-3-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 19, 2013 at 01:31:37PM -0800, Jesse Barnes wrote: > From: Chris Wilson <chris@chris-wilson.co.uk> > > Wrap a preallocated region of stolen memory within an ordinary GEM > object, for example the BIOS framebuffer. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Queued for -next, thanks for the patch. My merge plan here still stands like it was a few weeks ago: I'd like to slurp in patches 2-5 asap (i.e. up to the framebuffer wrapping), but I think the inital mode readout should be rebased on top of the pipe_config infrastructure. For patch 1 I still think that would look better when we just move the pch refclock init into the global modeset resources stuff - we need do to such things with our refclock handling anyway for some cute hsw features. But since the other patches in the fb wrapping part seem to have pending review request from Imre, I'll punt on the others for now. -Daniel
On Tue, 26 Mar 2013 20:46:24 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Feb 19, 2013 at 01:31:37PM -0800, Jesse Barnes wrote: > > From: Chris Wilson <chris@chris-wilson.co.uk> > > > > Wrap a preallocated region of stolen memory within an ordinary GEM > > object, for example the BIOS framebuffer. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Queued for -next, thanks for the patch. My merge plan here still stands > like it was a few weeks ago: I'd like to slurp in patches 2-5 asap (i.e. > up to the framebuffer wrapping), but I think the inital mode readout > should be rebased on top of the pipe_config infrastructure. > > For patch 1 I still think that would look better when we just move the pch > refclock init into the global modeset resources stuff - we need do to such > things with our refclock handling anyway for some cute hsw features. > > But since the other patches in the fb wrapping part seem to have pending > review request from Imre, I'll punt on the others for now. Ok thanks, I'll update with Imre's comments and see about the PCH refclk bits and repost the series.
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e95337c..9b5478f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1717,6 +1717,11 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev); void i915_gem_cleanup_stolen(struct drm_device *dev); struct drm_i915_gem_object * i915_gem_object_create_stolen(struct drm_device *dev, u32 size); +struct drm_i915_gem_object * +i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, + u32 stolen_offset, + u32 gtt_offset, + u32 size); void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj); /* i915_gem_tiling.c */ diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 9f01332..7f1735c 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -309,6 +309,71 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size) return NULL; } +struct drm_i915_gem_object * +i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, + u32 stolen_offset, + u32 gtt_offset, + u32 size) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_gem_object *obj; + struct drm_mm_node *stolen; + + if (dev_priv->mm.stolen_base == 0) + return NULL; + + DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n", + stolen_offset, gtt_offset, size); + + /* KISS and expect everything to be page-aligned */ + BUG_ON(stolen_offset & 4095); + BUG_ON(gtt_offset & 4095); + BUG_ON(size & 4095); + + if (WARN_ON(size == 0)) + return NULL; + + stolen = drm_mm_create_block(&dev_priv->mm.stolen, + stolen_offset, size, + false); + if (stolen == NULL) { + DRM_DEBUG_KMS("failed to allocate stolen space\n"); + return NULL; + } + + obj = _i915_gem_object_create_stolen(dev, stolen); + if (obj == NULL) { + DRM_DEBUG_KMS("failed to allocate stolen object\n"); + drm_mm_put_block(stolen); + return NULL; + } + + /* To simplify the initialisation sequence between KMS and GTT, + * we allow construction of the stolen object prior to + * setting up the GTT space. The actual reservation will occur + * later. + */ + if (drm_mm_initialized(&dev_priv->mm.gtt_space)) { + obj->gtt_space = drm_mm_create_block(&dev_priv->mm.gtt_space, + gtt_offset, size, + false); + if (obj->gtt_space == NULL) { + DRM_DEBUG_KMS("failed to allocate stolen GTT space\n"); + drm_gem_object_unreference(&obj->base); + return NULL; + } + } else + obj->gtt_space = I915_GTT_RESERVED; + + obj->gtt_offset = gtt_offset; + obj->has_global_gtt_mapping = 1; + + list_add_tail(&obj->gtt_list, &dev_priv->mm.bound_list); + list_add_tail(&obj->mm_list, &dev_priv->mm.inactive_list); + + return obj; +} + void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) {