2022-04-12 20:25:14

by Bob Beckett

Subject: [PATCH v2 2/5] drm/i915: sanitize mem_flags for stolen buffers

stolen regions are not page backed or considered iomem.

Signed-off-by: Robert Beckett <[email protected]>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
index 358f8a1a30ce..9fe8132de3b2 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
@@ -122,8 +122,9 @@ void i915_ttm_adjust_gem_after_move(struct drm_i915_gem_object *obj)

obj->mem_flags &= ~(I915_BO_FLAG_STRUCT_PAGE | I915_BO_FLAG_IOMEM);

- obj->mem_flags |= i915_ttm_cpu_maps_iomem(bo->resource) ? I915_BO_FLAG_IOMEM :
- I915_BO_FLAG_STRUCT_PAGE;
+ if (obj->mm.region->id != INTEL_REGION_STOLEN_SMEM)
+ obj->mem_flags |= i915_ttm_cpu_maps_iomem(bo->resource) ? I915_BO_FLAG_IOMEM :
+ I915_BO_FLAG_STRUCT_PAGE;

cache_level = i915_ttm_cache_level(to_i915(bo->base.dev), bo->resource,
bo->ttm);
--
2.25.1

2022-04-15 08:40:56

by Thomas Hellström

Subject: Re: [PATCH v2 2/5] drm/i915: sanitize mem_flags for stolen buffers

On Tue, 2022-04-12 at 15:18 +0000, Robert Beckett wrote:
> stolen regions are not page backed or considered iomem.

thus...

A little more elaborate commit message please.


>
> Signed-off-by: Robert Beckett <[email protected]>

Reviewed-by: Thomas Hellström <[email protected]>


> ---
>  drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
> b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
> index 358f8a1a30ce..9fe8132de3b2 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
> @@ -122,8 +122,9 @@ void i915_ttm_adjust_gem_after_move(struct
> drm_i915_gem_object *obj)
>  
>         obj->mem_flags &= ~(I915_BO_FLAG_STRUCT_PAGE |
> I915_BO_FLAG_IOMEM);
>  
> -       obj->mem_flags |= i915_ttm_cpu_maps_iomem(bo->resource) ?
> I915_BO_FLAG_IOMEM :
> -               I915_BO_FLAG_STRUCT_PAGE;
> +       if (obj->mm.region->id != INTEL_REGION_STOLEN_SMEM)
> +               obj->mem_flags |= i915_ttm_cpu_maps_iomem(bo-
> >resource) ? I915_BO_FLAG_IOMEM :
> +                       I915_BO_FLAG_STRUCT_PAGE;
>  
>         cache_level = i915_ttm_cache_level(to_i915(bo->base.dev), bo-
> >resource,
>                                            bo->ttm);