lkml.org 
[lkml]   [2022]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] drm/i915: use IOMEM_ERR_PTR() directly
From

On 02/05/2022 09:30, Jani Nikula wrote:
> On Mon, 02 May 2022, Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>> Use IOMEM_ERR_PTR() instead of self defined IO_ERR_PTR().
>>
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Pushed to drm-intel-gt-next, thanks for the patch and review!

Regards,

Tvrtko

>
>> ---
>> drivers/gpu/drm/i915/i915_vma.c | 4 ++--
>> drivers/gpu/drm/i915/i915_vma.h | 1 -
>> 2 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
>> index 94fcdb7bd21d..639605c89b7b 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.c
>> +++ b/drivers/gpu/drm/i915/i915_vma.c
>> @@ -541,7 +541,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
>> int err;
>>
>> if (WARN_ON_ONCE(vma->obj->flags & I915_BO_ALLOC_GPU_ONLY))
>> - return IO_ERR_PTR(-EINVAL);
>> + return IOMEM_ERR_PTR(-EINVAL);
>>
>> if (!i915_gem_object_is_lmem(vma->obj)) {
>> if (GEM_WARN_ON(!i915_vma_is_map_and_fenceable(vma))) {
>> @@ -594,7 +594,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
>> err_unpin:
>> __i915_vma_unpin(vma);
>> err:
>> - return IO_ERR_PTR(err);
>> + return IOMEM_ERR_PTR(err);
>> }
>>
>> void i915_vma_flush_writes(struct i915_vma *vma)
>> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
>> index 67ae7341c7e0..8e74972fdca3 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.h
>> +++ b/drivers/gpu/drm/i915/i915_vma.h
>> @@ -331,7 +331,6 @@ static inline bool i915_node_color_differs(const struct drm_mm_node *node,
>> * Returns a valid iomapped pointer or ERR_PTR.
>> */
>> void __iomem *i915_vma_pin_iomap(struct i915_vma *vma);
>> -#define IO_ERR_PTR(x) ((void __iomem *)ERR_PTR(x))
>>
>> /**
>> * i915_vma_unpin_iomap - unpins the mapping returned from i915_vma_iomap
>

\
 
 \ /
  Last update: 2022-05-04 14:12    [W:0.582 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site