[Intel-gfx] [PATCH] drm/i915: Use helper func to find out map type

[Das, Nirmoy]

On 12/16/2022 4:59 PM, Andrzej Hajda wrote:
> On 16.12.2022 16:43, Matthew Auld wrote:
>> On 16/12/2022 15:27, Nirmoy Das wrote:
>>> Use i915_coherent_map_type() function to find out
>>> map_type of the shmem obj.
>>>
>>> Signed-off-by: Nirmoy Das <nirmoy.das at intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +++++--
>>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c 
>>> b/drivers/gpu/drm/i915/gt/shmem_utils.c
>>> index 402f085f3a02..e1a69803624f 100644
>>> --- a/drivers/gpu/drm/i915/gt/shmem_utils.c
>>> +++ b/drivers/gpu/drm/i915/gt/shmem_utils.c
>>> @@ -8,6 +8,7 @@
>>>   #include <linux/pagemap.h>
>>>   #include <linux/shmem_fs.h>
>>> +#include "i915_drv.h"
>>>   #include "gem/i915_gem_object.h"
>>>   #include "gem/i915_gem_lmem.h"
>>>   #include "shmem_utils.h"
>>> @@ -32,6 +33,8 @@ struct file *shmem_create_from_data(const char 
>>> *name, void *data, size_t len)
>>>   struct file *shmem_create_from_object(struct drm_i915_gem_object 
>>> *obj)
>>>   {
>>> +    struct drm_i915_private *i915 = to_i915(obj->base.dev);
>>> +    enum i915_map_type map_type;
>>>       struct file *file;
>>>       void *ptr;
>>> @@ -41,8 +44,8 @@ struct file *shmem_create_from_object(struct 
>>> drm_i915_gem_object *obj)
>>>           return file;
>>>       }
>>> -    ptr = i915_gem_object_pin_map_unlocked(obj, 
>>> i915_gem_object_is_lmem(obj) ?
>>> -                        I915_MAP_WC : I915_MAP_WB);
>>> +    map_type = i915_coherent_map_type(i915, obj, false);
>>
>> This will now use wc on non-llc.
>
> i915_coherent_map_type(i915, obj, true) should do the trick.


Thanks Matt and  Andrzej for catching this. I will resend.


Nirmoy

>
> Regards
> Andrzej
>
>>
>>> +    ptr = i915_gem_object_pin_map_unlocked(obj, map_type);
>>>       if (IS_ERR(ptr))
>>>           return ERR_CAST(ptr);
>