Commit 337e54f7 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/fbc: Don't pass around the mm node

No point in passing the mm node explicitly to find_compression_limit()
since it's always the same node for the cfb.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210610183237.3920-5-ville.syrjala@linux.intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 45a321a7
...@@ -434,10 +434,10 @@ static u64 intel_fbc_cfb_base_max(struct drm_i915_private *i915) ...@@ -434,10 +434,10 @@ static u64 intel_fbc_cfb_base_max(struct drm_i915_private *i915)
} }
static int find_compression_limit(struct drm_i915_private *dev_priv, static int find_compression_limit(struct drm_i915_private *dev_priv,
struct drm_mm_node *node,
unsigned int size, unsigned int size,
unsigned int fb_cpp) unsigned int fb_cpp)
{ {
struct intel_fbc *fbc = &dev_priv->fbc;
int compression_limit = 1; int compression_limit = 1;
int ret; int ret;
u64 end; u64 end;
...@@ -462,8 +462,8 @@ static int find_compression_limit(struct drm_i915_private *dev_priv, ...@@ -462,8 +462,8 @@ static int find_compression_limit(struct drm_i915_private *dev_priv,
*/ */
/* Try to over-allocate to reduce reallocations and fragmentation. */ /* Try to over-allocate to reduce reallocations and fragmentation. */
ret = i915_gem_stolen_insert_node_in_range(dev_priv, node, size <<= 1, ret = i915_gem_stolen_insert_node_in_range(dev_priv, &fbc->compressed_fb,
4096, 0, end); size <<= 1, 4096, 0, end);
if (ret == 0) if (ret == 0)
return compression_limit; return compression_limit;
...@@ -473,8 +473,8 @@ static int find_compression_limit(struct drm_i915_private *dev_priv, ...@@ -473,8 +473,8 @@ static int find_compression_limit(struct drm_i915_private *dev_priv,
(fb_cpp == 2 && compression_limit == 2)) (fb_cpp == 2 && compression_limit == 2))
return 0; return 0;
ret = i915_gem_stolen_insert_node_in_range(dev_priv, node, size >>= 1, ret = i915_gem_stolen_insert_node_in_range(dev_priv, &fbc->compressed_fb,
4096, 0, end); size >>= 1, 4096, 0, end);
if (ret && DISPLAY_VER(dev_priv) <= 4) { if (ret && DISPLAY_VER(dev_priv) <= 4) {
return 0; return 0;
} else if (ret) { } else if (ret) {
...@@ -496,8 +496,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, ...@@ -496,8 +496,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,
drm_WARN_ON(&dev_priv->drm, drm_WARN_ON(&dev_priv->drm,
drm_mm_node_allocated(&fbc->compressed_llb)); drm_mm_node_allocated(&fbc->compressed_llb));
ret = find_compression_limit(dev_priv, &fbc->compressed_fb, ret = find_compression_limit(dev_priv, size, fb_cpp);
size, fb_cpp);
if (!ret) if (!ret)
goto err_llb; goto err_llb;
else if (ret > 1) { else if (ret > 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment