niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/fbc: Allocate llb before cfb

Browse source 
Since the llb allocation has a fixed size, let's grab it before
the potentially variable sized cfb. That should avoid some allocation
failure cases once we allow different compression ratios for FBC1.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210610183237.3920-10-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
This commit is contained in:
Ville Syrjälä 2021-06-10 21:32:37 +03:00
parent 8538d78e26
commit 46b2c40e0a
1 changed files with 9 additions and 9 deletions

18
drivers/gpu/drm/i915/display/intel_fbc.c
View file

@ -492,6 +492,13 @@ 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));
if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv)) {
ret = i915_gem_stolen_insert_node(dev_priv, &fbc->compressed_llb,
4096, 4096);
if (ret)
goto err;
}
ret = find_compression_limit(dev_priv, size, fb_cpp); ret = find_compression_limit(dev_priv, size, fb_cpp);
if (!ret) if (!ret)
goto err_llb; goto err_llb;
@ -502,22 +509,15 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,
fbc->limit = ret; fbc->limit = ret;
if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv)) {
ret = i915_gem_stolen_insert_node(dev_priv, &fbc->compressed_llb,
4096, 4096);
if (ret)
goto err_fb;
}
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n", "reserved %llu bytes of contiguous stolen space for FBC, limit: %d\n",
fbc->compressed_fb.size, fbc->limit); fbc->compressed_fb.size, fbc->limit);
return 0; return 0;
err_fb:
i915_gem_stolen_remove_node(dev_priv, &fbc->compressed_fb);
err_llb: err_llb:
i915_gem_stolen_remove_node(dev_priv, &fbc->compressed_llb);
err:
if (drm_mm_initialized(&dev_priv->mm.stolen)) if (drm_mm_initialized(&dev_priv->mm.stolen))
drm_info_once(&dev_priv->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); drm_info_once(&dev_priv->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;