Commit 0dc987b6 authored by Juha-Pekka Heikkila's avatar Juha-Pekka Heikkila Committed by Matthew Auld
Browse files

drm/i915/display: Add smem fallback allocation for dpt 



Add fallback smem allocation for dpt if stolen memory
allocation failed.

Signed-off-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220610121205.29645-1-juhapekka.heikkila@gmail.com
parent d976521a

drivers/gpu/drm/i915/display/intel_dpt.c

+12 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "gem/i915_gem_domain.h"

#include "gem/i915_gem_internal.h"

#include "gt/gen8_ppgtt.h"



#include "i915_drv.h"
@@ -127,8 +128,12 @@ struct i915_vma *intel_dpt_pin(struct i915_address_space *vm) 
	struct i915_vma *vma;

	void __iomem *iomem;

	struct i915_gem_ww_ctx ww;

	u64 pin_flags = 0;

	int err;



	if (i915_gem_object_is_stolen(dpt->obj))

		pin_flags |= PIN_MAPPABLE;



	wakeref = intel_runtime_pm_get(&i915->runtime_pm);

	atomic_inc(&i915->gpu_error.pending_fb_pin);
@@ -138,7 +143,7 @@ struct i915_vma *intel_dpt_pin(struct i915_address_space *vm) 
			continue;



		vma = i915_gem_object_ggtt_pin_ww(dpt->obj, &ww, NULL, 0, 4096,

						  HAS_LMEM(i915) ? 0 : PIN_MAPPABLE);

						  pin_flags);

		if (IS_ERR(vma)) {

			err = PTR_ERR(vma);

			continue;
@@ -248,10 +253,13 @@ intel_dpt_create(struct intel_framebuffer *fb) 


	size = round_up(size * sizeof(gen8_pte_t), I915_GTT_PAGE_SIZE);



	if (HAS_LMEM(i915))

	dpt_obj = i915_gem_object_create_lmem(i915, size, I915_BO_ALLOC_CONTIGUOUS);

	else

	if (IS_ERR(dpt_obj) && i915_ggtt_has_aperture(to_gt(i915)->ggtt))

		dpt_obj = i915_gem_object_create_stolen(i915, size);

	if (IS_ERR(dpt_obj) && !HAS_LMEM(i915)) {

		drm_dbg_kms(&i915->drm, "Allocating dpt from smem\n");

		dpt_obj = i915_gem_object_create_internal(i915, size);

	}

	if (IS_ERR(dpt_obj))

		return ERR_CAST(dpt_obj);