From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: CQ Tang <cq.tang@intel.com>, dri-devel@lists.freedesktop.org Subject: [PATCH 05/19] drm/i915/stolen: enforce the min_page_size contract Date: Mon, 12 Apr 2021 10:05:12 +0100 [thread overview] Message-ID: <20210412090526.30547-6-matthew.auld@intel.com> (raw) In-Reply-To: <20210412090526.30547-1-matthew.auld@intel.com> From: CQ Tang <cq.tang@intel.com> Since stolen can now be device local-memory underneath, we should try to enforce any min_page_size restrictions when allocating pages. Signed-off-by: CQ Tang <cq.tang@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index 56dd58bef5ee..f713eabb7671 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -677,7 +677,8 @@ static int _i915_gem_object_stolen_init(struct intel_memory_region *mem, if (!stolen) return -ENOMEM; - ret = i915_gem_stolen_insert_node(i915, stolen, size, 4096); + ret = i915_gem_stolen_insert_node(i915, stolen, size, + mem->min_page_size); if (ret) goto err_free; @@ -817,8 +818,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *i915, /* KISS and expect everything to be page-aligned */ if (GEM_WARN_ON(size == 0) || - GEM_WARN_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE)) || - GEM_WARN_ON(!IS_ALIGNED(stolen_offset, I915_GTT_MIN_ALIGNMENT))) + GEM_WARN_ON(!IS_ALIGNED(size, mem->min_page_size)) || + GEM_WARN_ON(!IS_ALIGNED(stolen_offset, mem->min_page_size))) return ERR_PTR(-EINVAL); stolen = kzalloc(sizeof(*stolen), GFP_KERNEL); -- 2.26.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 05/19] drm/i915/stolen: enforce the min_page_size contract Date: Mon, 12 Apr 2021 10:05:12 +0100 [thread overview] Message-ID: <20210412090526.30547-6-matthew.auld@intel.com> (raw) In-Reply-To: <20210412090526.30547-1-matthew.auld@intel.com> From: CQ Tang <cq.tang@intel.com> Since stolen can now be device local-memory underneath, we should try to enforce any min_page_size restrictions when allocating pages. Signed-off-by: CQ Tang <cq.tang@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index 56dd58bef5ee..f713eabb7671 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -677,7 +677,8 @@ static int _i915_gem_object_stolen_init(struct intel_memory_region *mem, if (!stolen) return -ENOMEM; - ret = i915_gem_stolen_insert_node(i915, stolen, size, 4096); + ret = i915_gem_stolen_insert_node(i915, stolen, size, + mem->min_page_size); if (ret) goto err_free; @@ -817,8 +818,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *i915, /* KISS and expect everything to be page-aligned */ if (GEM_WARN_ON(size == 0) || - GEM_WARN_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE)) || - GEM_WARN_ON(!IS_ALIGNED(stolen_offset, I915_GTT_MIN_ALIGNMENT))) + GEM_WARN_ON(!IS_ALIGNED(size, mem->min_page_size)) || + GEM_WARN_ON(!IS_ALIGNED(stolen_offset, mem->min_page_size))) return ERR_PTR(-EINVAL); stolen = kzalloc(sizeof(*stolen), GFP_KERNEL); -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-04-12 9:09 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-12 9:05 [PATCH 00/19] More DG1 enabling Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 01/19] drm/i915/gt: Skip aperture remapping selftest where there is no aperture Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 14:48 ` Daniel Vetter 2021-04-12 14:48 ` Daniel Vetter 2021-04-12 9:05 ` [PATCH 02/19] drm/i915/selftests: Only query RAPL for integrated power measurements Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 03/19] drm/i915: Create stolen memory region from local memory Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:01 ` Tvrtko Ursulin 2021-04-14 15:01 ` Tvrtko Ursulin 2021-04-16 15:04 ` Matthew Auld 2021-04-16 15:04 ` Matthew Auld 2021-04-19 14:15 ` Tvrtko Ursulin 2021-04-19 14:15 ` Tvrtko Ursulin 2021-04-12 9:05 ` [PATCH 04/19] drm/i915/stolen: treat stolen local as normal " Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:06 ` Tvrtko Ursulin 2021-04-14 15:06 ` Tvrtko Ursulin 2021-04-12 9:05 ` Matthew Auld [this message] 2021-04-12 9:05 ` [Intel-gfx] [PATCH 05/19] drm/i915/stolen: enforce the min_page_size contract Matthew Auld 2021-04-14 15:07 ` Tvrtko Ursulin 2021-04-14 15:07 ` Tvrtko Ursulin 2021-04-12 9:05 ` [PATCH 06/19] drm/i915/stolen: pass the allocation flags Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:09 ` Tvrtko Ursulin 2021-04-14 15:09 ` Tvrtko Ursulin 2021-04-16 13:53 ` Matthew Auld 2021-04-16 13:53 ` Matthew Auld 2021-04-12 9:05 ` [PATCH 07/19] drm/i915/fbdev: Use lmem physical addresses for fb_mmap() on discrete Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 15:00 ` Daniel Vetter 2021-04-12 15:00 ` [Intel-gfx] " Daniel Vetter 2021-04-12 9:05 ` [PATCH 08/19] drm/i915: Return error value when bo not in LMEM for discrete Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:16 ` Tvrtko Ursulin 2021-04-14 15:16 ` Tvrtko Ursulin 2021-04-12 9:05 ` [PATCH 09/19] drm/i915/lmem: Fail driver init if LMEM training failed Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 10/19] drm/i915/dg1: Fix mapping type for default state object Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 11/19] drm/i915: Update the helper to set correct mapping Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:22 ` Tvrtko Ursulin 2021-04-14 15:22 ` Tvrtko Ursulin 2021-04-14 16:20 ` Matthew Auld 2021-04-14 16:20 ` Matthew Auld 2021-04-15 8:20 ` Tvrtko Ursulin 2021-04-15 8:20 ` Tvrtko Ursulin 2021-04-15 9:23 ` Matthew Auld 2021-04-15 9:23 ` Matthew Auld 2021-04-15 11:05 ` Tvrtko Ursulin 2021-04-15 11:05 ` Tvrtko Ursulin 2021-04-19 11:30 ` Matthew Auld 2021-04-19 11:30 ` Matthew Auld 2021-04-19 14:07 ` Tvrtko Ursulin 2021-04-19 14:07 ` Tvrtko Ursulin 2021-04-19 14:37 ` Matthew Auld 2021-04-19 14:37 ` Matthew Auld 2021-04-19 15:01 ` Tvrtko Ursulin 2021-04-19 15:01 ` Tvrtko Ursulin 2021-04-21 11:42 ` Matthew Auld 2021-04-21 11:42 ` Matthew Auld 2021-04-21 15:41 ` Tvrtko Ursulin 2021-04-21 15:41 ` Tvrtko Ursulin 2021-04-21 19:13 ` Matthew Auld 2021-04-21 19:13 ` Matthew Auld 2021-04-26 8:57 ` Matthew Auld 2021-04-26 8:57 ` Matthew Auld 2021-04-26 9:21 ` Tvrtko Ursulin 2021-04-26 9:21 ` Tvrtko Ursulin 2021-04-12 9:05 ` [PATCH 12/19] drm/i915/lmem: Bypass aperture when lmem is available Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:33 ` Tvrtko Ursulin 2021-04-14 15:33 ` Tvrtko Ursulin 2021-04-16 14:25 ` Matthew Auld 2021-04-16 14:25 ` Matthew Auld 2021-04-19 14:16 ` Tvrtko Ursulin 2021-04-19 14:16 ` Tvrtko Ursulin 2021-04-12 9:05 ` [PATCH 13/19] drm/i915/dg1: Read OPROM via SPI controller Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-09-17 23:29 ` Lucas De Marchi 2021-04-12 9:05 ` [PATCH 14/19] drm/i915/oprom: Basic sanitization Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 22:36 ` kernel test robot 2021-04-12 22:36 ` kernel test robot 2021-04-12 22:36 ` kernel test robot 2021-04-12 22:36 ` [PATCH] drm/i915/oprom: fix memdup.cocci warnings kernel test robot 2021-04-12 22:36 ` kernel test robot 2021-04-12 22:36 ` [Intel-gfx] " kernel test robot 2021-05-17 11:57 ` [Intel-gfx] [PATCH 14/19] drm/i915/oprom: Basic sanitization Jani Nikula 2021-05-17 11:57 ` Jani Nikula 2021-09-18 4:30 ` Lucas De Marchi 2021-09-20 7:41 ` Jani Nikula 2021-09-20 8:04 ` Gupta, Anshuman 2021-09-20 8:04 ` Gupta, Anshuman 2021-09-20 8:43 ` Jani Nikula 2021-09-20 8:43 ` Jani Nikula 2021-09-22 21:53 ` Lucas De Marchi 2021-04-12 9:05 ` [PATCH 15/19] drm/i915: WA for zero memory channel Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 16:57 ` Souza, Jose 2021-04-12 16:57 ` [Intel-gfx] " Souza, Jose 2021-04-12 9:05 ` [PATCH 16/19] drm/i915/dg1: Compute MEM Bandwidth using MCHBAR Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 17/19] drm/i915/dg1: Double memory bandwidth available Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 9:05 ` [PATCH 18/19] drm/i915/gtt: map the PD up front Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-12 15:17 ` Daniel Vetter 2021-04-12 15:17 ` Daniel Vetter 2021-04-12 16:01 ` Jani Nikula 2021-04-12 16:01 ` Jani Nikula 2021-04-12 16:36 ` Daniel Vetter 2021-04-12 16:36 ` Daniel Vetter 2021-04-12 16:08 ` Matthew Auld 2021-04-12 16:08 ` Matthew Auld 2021-04-12 17:00 ` Daniel Vetter 2021-04-12 17:00 ` Daniel Vetter 2021-04-13 9:28 ` Matthew Auld 2021-04-13 9:28 ` Matthew Auld 2021-04-13 10:18 ` Daniel Vetter 2021-04-13 10:18 ` Daniel Vetter 2021-04-12 9:05 ` [PATCH 19/19] drm/i915/gtt/dgfx: place the PD in LMEM Matthew Auld 2021-04-12 9:05 ` [Intel-gfx] " Matthew Auld 2021-04-14 15:37 ` Tvrtko Ursulin 2021-04-14 15:37 ` Tvrtko Ursulin 2021-04-12 11:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for More DG1 enabling Patchwork 2021-04-12 11:12 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2021-04-12 11:37 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-04-12 13:37 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210412090526.30547-6-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=cq.tang@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.