diff mbox series

[2/5] drm/i915: align the plane_vma to min_page_size of stolen mem

Message ID 20220128185209.18077-3-ramalingam.c@intel.com (mailing list archive)
State New, archived
Headers show
Series Misc DG2 enabling patches | expand

Commit Message

Ramalingam C Jan. 28, 2022, 6:52 p.m. UTC
Align the plane vma size to the stolem memory regions' min_page_size.

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
cc: Matthew Auld <matthew.auld@intel.com>
cc: Chris P Wilson <chris.p.wilson@intel.com>
---
 drivers/gpu/drm/i915/display/intel_plane_initial.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Matthew Auld Jan. 31, 2022, 10:18 a.m. UTC | #1
On 28/01/2022 18:52, Ramalingam C wrote:
> Align the plane vma size to the stolem memory regions' min_page_size.
> 
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> cc: Matthew Auld <matthew.auld@intel.com>
> cc: Chris P Wilson <chris.p.wilson@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Matthew Auld Jan. 31, 2022, 10:26 a.m. UTC | #2
On Mon, 31 Jan 2022 at 10:18, Matthew Auld <matthew.auld@intel.com> wrote:
>
> On 28/01/2022 18:52, Ramalingam C wrote:
> > Align the plane vma size to the stolem memory regions' min_page_size.
> >
> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> > cc: Matthew Auld <matthew.auld@intel.com>
> > cc: Chris P Wilson <chris.p.wilson@intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>

Do you know for sure that the initial fb is allocated in stolen-lmem on DG2 btw?
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index e4186a0b8edb..543877998078 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -46,17 +46,18 @@  static struct i915_vma *
 initial_plane_vma(struct drm_i915_private *i915,
 		  struct intel_initial_plane_config *plane_config)
 {
+	struct intel_memory_region *mem = i915->mm.stolen_region;
 	struct drm_i915_gem_object *obj;
 	struct i915_vma *vma;
 	u32 base, size;
 
-	if (plane_config->size == 0)
+	if (!mem || plane_config->size == 0)
 		return NULL;
 
 	base = round_down(plane_config->base,
 			  I915_GTT_MIN_ALIGNMENT);
 	size = round_up(plane_config->base + plane_config->size,
-			I915_GTT_MIN_ALIGNMENT);
+			mem->min_page_size);
 	size -= base;
 
 	/*