after the buffer object is successfully mapped, call radeon_bo_kunmap before the function returns.
Signed-off-by: zhanglianjie <[email protected]>
Reviewed-by: Christian König <[email protected]>
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 377f9cdb5b53..0558d928d98d 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -497,6 +497,7 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
handle = msg[2];
if (handle == 0) {
+ radeon_bo_kunmap(bo);
DRM_ERROR("Invalid UVD handle!\n");
return -EINVAL;
}
@@ -559,12 +560,10 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
return 0;
default:
-
DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
- return -EINVAL;
}
- BUG();
+ radeon_bo_kunmap(bo);
return -EINVAL;
}
--
2.20.1
I think so, Alex will probably pick that up.
Thanks,
Christian.
Am 08.02.22 um 09:28 schrieb zhanglianjie:
> I am very sorry that I submitted many times due to the character
> coding problem. Can PATCH V4 be used?
>
>> I'm scratching my head what you are doing here?
>>
>> That's the fives time you send out the same patch, so something is
>> going wrong here :)
>>
>> Please double check why that lands in your outbox over and over again.
>>
>> Regards,
>> Christian.
>>
>> Am 08.02.22 um 09:14 schrieb zhanglianjie:
>>> after the buffer object is successfully mapped, call
>>> radeon_bo_kunmap before the function returns.
>>>
>>> Signed-off-by: zhanglianjie <[email protected]>
>>> Reviewed-by: Christian König <[email protected]>
>>>
>>> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c
>>> b/drivers/gpu/drm/radeon/radeon_uvd.c
>>> index 377f9cdb5b53..0558d928d98d 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
>>> @@ -497,6 +497,7 @@ static int radeon_uvd_cs_msg(struct
>>> radeon_cs_parser *p, struct radeon_bo *bo,
>>> handle = msg[2];
>>>
>>> if (handle == 0) {
>>> + radeon_bo_kunmap(bo);
>>> DRM_ERROR("Invalid UVD handle!\n");
>>> return -EINVAL;
>>> }
>>> @@ -559,12 +560,10 @@ static int radeon_uvd_cs_msg(struct
>>> radeon_cs_parser *p, struct radeon_bo *bo,
>>> return 0;
>>>
>>> default:
>>> -
>>> DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
>>> - return -EINVAL;
>>> }
>>>
>>> - BUG();
>>> + radeon_bo_kunmap(bo);
>>> return -EINVAL;
>>> }
>>>
>>> --
>>> 2.20.1
>>>
>>>
>>>
>>
>>
>
>
>
I'm scratching my head what you are doing here?
That's the fives time you send out the same patch, so something is going
wrong here :)
Please double check why that lands in your outbox over and over again.
Regards,
Christian.
Am 08.02.22 um 09:14 schrieb zhanglianjie:
> after the buffer object is successfully mapped, call radeon_bo_kunmap before the function returns.
>
> Signed-off-by: zhanglianjie <[email protected]>
> Reviewed-by: Christian König <[email protected]>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
> index 377f9cdb5b53..0558d928d98d 100644
> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
> @@ -497,6 +497,7 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
> handle = msg[2];
>
> if (handle == 0) {
> + radeon_bo_kunmap(bo);
> DRM_ERROR("Invalid UVD handle!\n");
> return -EINVAL;
> }
> @@ -559,12 +560,10 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
> return 0;
>
> default:
> -
> DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
> - return -EINVAL;
> }
>
> - BUG();
> + radeon_bo_kunmap(bo);
> return -EINVAL;
> }
>
> --
> 2.20.1
>
>
>
Applied the series. Thanks!
Alex
On Tue, Feb 8, 2022 at 3:33 AM Christian König <[email protected]> wrote:
>
> I think so, Alex will probably pick that up.
>
> Thanks,
> Christian.
>
> Am 08.02.22 um 09:28 schrieb zhanglianjie:
> > I am very sorry that I submitted many times due to the character
> > coding problem. Can PATCH V4 be used?
> >
> >> I'm scratching my head what you are doing here?
> >>
> >> That's the fives time you send out the same patch, so something is
> >> going wrong here :)
> >>
> >> Please double check why that lands in your outbox over and over again.
> >>
> >> Regards,
> >> Christian.
> >>
> >> Am 08.02.22 um 09:14 schrieb zhanglianjie:
> >>> after the buffer object is successfully mapped, call
> >>> radeon_bo_kunmap before the function returns.
> >>>
> >>> Signed-off-by: zhanglianjie <[email protected]>
> >>> Reviewed-by: Christian König <[email protected]>
> >>>
> >>> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c
> >>> b/drivers/gpu/drm/radeon/radeon_uvd.c
> >>> index 377f9cdb5b53..0558d928d98d 100644
> >>> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
> >>> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
> >>> @@ -497,6 +497,7 @@ static int radeon_uvd_cs_msg(struct
> >>> radeon_cs_parser *p, struct radeon_bo *bo,
> >>> handle = msg[2];
> >>>
> >>> if (handle == 0) {
> >>> + radeon_bo_kunmap(bo);
> >>> DRM_ERROR("Invalid UVD handle!\n");
> >>> return -EINVAL;
> >>> }
> >>> @@ -559,12 +560,10 @@ static int radeon_uvd_cs_msg(struct
> >>> radeon_cs_parser *p, struct radeon_bo *bo,
> >>> return 0;
> >>>
> >>> default:
> >>> -
> >>> DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
> >>> - return -EINVAL;
> >>> }
> >>>
> >>> - BUG();
> >>> + radeon_bo_kunmap(bo);
> >>> return -EINVAL;
> >>> }
> >>>
> >>> --
> >>> 2.20.1
> >>>
> >>>
> >>>
> >>
> >>
> >
> >
> >
>