korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-19 04:14:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: add simple wrappers for stolen node insertion/removal

Browse Source 
We want to move the FBC code out of i915_gem_stolen.c, but that code
directly adds/removes stolen memory nodes. Let's create this
abstraction, so i915_gme_stolen.c is still in control of all the
stolen memory handling. The abstraction will also allow us to add
locking assertions later.

v2:
  - Add dev_priv as remove_node() argument since we'll need it later
    (Chris).

Requested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2015-07-02 19:25:07 -03:00 committed by Daniel Vetter
parent e72072b6d7
commit d713fd4976
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_drv.h
View File

@ -3112,6 +3112,11 @@ static inline void i915_gem_chipset_flush(struct drm_device *dev)
} }
/* i915_gem_stolen.c */ /* i915_gem_stolen.c */
int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
struct drm_mm_node *node, u64 size,
unsigned alignment);
void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
struct drm_mm_node *node);
int i915_gem_init_stolen(struct drm_device *dev); int i915_gem_init_stolen(struct drm_device *dev);
int i915_gem_stolen_setup_compression(struct drm_device *dev, int size, int fb_cpp); int i915_gem_stolen_setup_compression(struct drm_device *dev, int size, int fb_cpp);
void i915_gem_stolen_cleanup_compression(struct drm_device *dev); void i915_gem_stolen_cleanup_compression(struct drm_device *dev);

48
drivers/gpu/drm/i915/i915_gem_stolen.c
View File

@ -42,6 +42,23 @@
* for is a boon. * for is a boon.
*/ */
int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
struct drm_mm_node *node, u64 size,
unsigned alignment)
{
if (!drm_mm_initialized(&dev_priv->mm.stolen))
return -ENODEV;
return drm_mm_insert_node(&dev_priv->mm.stolen, node, size, alignment,
DRM_MM_SEARCH_DEFAULT);
}
void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
struct drm_mm_node *node)
{
drm_mm_remove_node(node);
}
static unsigned long i915_stolen_to_physical(struct drm_device *dev) static unsigned long i915_stolen_to_physical(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -168,8 +185,7 @@ static int find_compression_threshold(struct drm_device *dev,
*/ */
/* Try to over-allocate to reduce reallocations and fragmentation. */ /* Try to over-allocate to reduce reallocations and fragmentation. */
ret = drm_mm_insert_node(&dev_priv->mm.stolen, node, ret = i915_gem_stolen_insert_node(dev_priv, node, size <<= 1, 4096);
size <<= 1, 4096, DRM_MM_SEARCH_DEFAULT);
if (ret == 0) if (ret == 0)
return compression_threshold; return compression_threshold;
@ -179,9 +195,7 @@ again:
(fb_cpp == 2 && compression_threshold == 2)) (fb_cpp == 2 && compression_threshold == 2))
return 0; return 0;
ret = drm_mm_insert_node(&dev_priv->mm.stolen, node, ret = i915_gem_stolen_insert_node(dev_priv, node, size >>= 1, 4096);
size >>= 1, 4096,
DRM_MM_SEARCH_DEFAULT);
if (ret && INTEL_INFO(dev)->gen <= 4) { if (ret && INTEL_INFO(dev)->gen <= 4) {
return 0; return 0;
} else if (ret) { } else if (ret) {
@ -218,8 +232,8 @@ static int i915_setup_compression(struct drm_device *dev, int size, int fb_cpp)
if (!compressed_llb) if (!compressed_llb)
goto err_fb; goto err_fb;
ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_llb, ret = i915_gem_stolen_insert_node(dev_priv, compressed_llb,
4096, 4096, DRM_MM_SEARCH_DEFAULT); 4096, 4096);
if (ret) if (ret)
goto err_fb; goto err_fb;
@ -240,7 +254,7 @@ static int i915_setup_compression(struct drm_device *dev, int size, int fb_cpp)
err_fb: err_fb:
kfree(compressed_llb); kfree(compressed_llb);
drm_mm_remove_node(&dev_priv->fbc.compressed_fb); i915_gem_stolen_remove_node(dev_priv, &dev_priv->fbc.compressed_fb);
err_llb: err_llb:
pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size); pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);
return -ENOSPC; return -ENOSPC;
@ -269,10 +283,11 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
if (dev_priv->fbc.uncompressed_size == 0) if (dev_priv->fbc.uncompressed_size == 0)
return; return;
drm_mm_remove_node(&dev_priv->fbc.compressed_fb); i915_gem_stolen_remove_node(dev_priv, &dev_priv->fbc.compressed_fb);
if (dev_priv->fbc.compressed_llb) { if (dev_priv->fbc.compressed_llb) {
drm_mm_remove_node(dev_priv->fbc.compressed_llb); i915_gem_stolen_remove_node(dev_priv,
dev_priv->fbc.compressed_llb);
kfree(dev_priv->fbc.compressed_llb); kfree(dev_priv->fbc.compressed_llb);
} }
@ -386,8 +401,10 @@ static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj)
static void static void
i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)
{ {
struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
if (obj->stolen) { if (obj->stolen) {
drm_mm_remove_node(obj->stolen); i915_gem_stolen_remove_node(dev_priv, obj->stolen);
kfree(obj->stolen); kfree(obj->stolen);
obj->stolen = NULL; obj->stolen = NULL;
} }
@ -449,8 +466,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
if (!stolen) if (!stolen)
return NULL; return NULL;
ret = drm_mm_insert_node(&dev_priv->mm.stolen, stolen, size, ret = i915_gem_stolen_insert_node(dev_priv, stolen, size, 4096);
4096, DRM_MM_SEARCH_DEFAULT);
if (ret) { if (ret) {
kfree(stolen); kfree(stolen);
return NULL; return NULL;
@ -460,7 +476,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
if (obj) if (obj)
return obj; return obj;
drm_mm_remove_node(stolen); i915_gem_stolen_remove_node(dev_priv, stolen);
kfree(stolen); kfree(stolen);
return NULL; return NULL;
} }
@ -505,7 +521,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
obj = _i915_gem_object_create_stolen(dev, stolen); obj = _i915_gem_object_create_stolen(dev, stolen);
if (obj == NULL) { if (obj == NULL) {
DRM_DEBUG_KMS("failed to allocate stolen object\n"); DRM_DEBUG_KMS("failed to allocate stolen object\n");
drm_mm_remove_node(stolen); i915_gem_stolen_remove_node(dev_priv, stolen);
kfree(stolen); kfree(stolen);
return NULL; return NULL;
} }
@ -546,7 +562,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
err_vma: err_vma:
i915_gem_vma_destroy(vma); i915_gem_vma_destroy(vma);
err_out: err_out:
drm_mm_remove_node(stolen); i915_gem_stolen_remove_node(dev_priv, stolen);
kfree(stolen); kfree(stolen);
drm_gem_object_unreference(&obj->base); drm_gem_object_unreference(&obj->base);
return NULL; return NULL;