diff mbox series

media: Fix compilation error

Message ID 20210402074017.49009-1-cuibixuan@huawei.com (mailing list archive)
State New, archived
Headers show
Series media: Fix compilation error | expand

Commit Message

Bixuan Cui April 2, 2021, 7:40 a.m. UTC
Fix the error:

drivers/staging/media/tegra-video/vi.c:1180:4:
error: implicit declaration of function 'host1x_syncpt_free' [-Werror,-Wimplicit-function-declaration]

Fixes: 3028a00c55bf ('gpu: host1x: Cleanup and refcounting for syncpoints')
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
---
 drivers/staging/media/tegra-video/vi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hans Verkuil April 7, 2021, 1:29 p.m. UTC | #1
On 02/04/2021 09:40, Bixuan Cui wrote:
> Fix the error:
> 
> drivers/staging/media/tegra-video/vi.c:1180:4:
> error: implicit declaration of function 'host1x_syncpt_free' [-Werror,-Wimplicit-function-declaration]

Against what tree is this being built? The mainline kernel doesn't have
host1x_syncpt_put, only host1x_syncpt_free.

Also, the subject line is very vague, something like this is much more descriptive:

[PATCH] media: tegra-video: replace host1x_syncpt_free by host1x_syncpt_put

Regards,

	Hans

> 
> Fixes: 3028a00c55bf ('gpu: host1x: Cleanup and refcounting for syncpoints')
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
> ---
>  drivers/staging/media/tegra-video/vi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
> index 7e0cb5529b49..df5ca3596470 100644
> --- a/drivers/staging/media/tegra-video/vi.c
> +++ b/drivers/staging/media/tegra-video/vi.c
> @@ -1177,7 +1177,7 @@ static int tegra_channel_host1x_syncpt_init(struct tegra_vi_channel *chan)
>  		mw_sp = host1x_syncpt_request(&vi->client, flags);
>  		if (!mw_sp) {
>  			dev_err(vi->dev, "failed to request memory ack syncpoint\n");
> -			host1x_syncpt_free(fs_sp);
> +			host1x_syncpt_put(fs_sp);
>  			ret = -ENOMEM;
>  			goto free_syncpts;
>  		}
>
Mikko Perttunen April 7, 2021, 1:45 p.m. UTC | #2
On 7.4.2021 16.29, Hans Verkuil wrote:
> On 02/04/2021 09:40, Bixuan Cui wrote:
>> Fix the error:
>>
>> drivers/staging/media/tegra-video/vi.c:1180:4:
>> error: implicit declaration of function 'host1x_syncpt_free' [-Werror,-Wimplicit-function-declaration]
> 
> Against what tree is this being built? The mainline kernel doesn't have
> host1x_syncpt_put, only host1x_syncpt_free.

This change was done only very recently, it's in linux-next and 
submitted for 5.13. I missed this one host1x_syncpt_free call in vi.c, 
but Thierry has already applied an equivalent patch on his end so the 
issue should be resolved.

Thanks,
Mikko

> 
> Also, the subject line is very vague, something like this is much more descriptive:
> 
> [PATCH] media: tegra-video: replace host1x_syncpt_free by host1x_syncpt_put
> 
> Regards,
> 
> 	Hans
> 
>>
>> Fixes: 3028a00c55bf ('gpu: host1x: Cleanup and refcounting for syncpoints')
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
>> ---
>>   drivers/staging/media/tegra-video/vi.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
>> index 7e0cb5529b49..df5ca3596470 100644
>> --- a/drivers/staging/media/tegra-video/vi.c
>> +++ b/drivers/staging/media/tegra-video/vi.c
>> @@ -1177,7 +1177,7 @@ static int tegra_channel_host1x_syncpt_init(struct tegra_vi_channel *chan)
>>   		mw_sp = host1x_syncpt_request(&vi->client, flags);
>>   		if (!mw_sp) {
>>   			dev_err(vi->dev, "failed to request memory ack syncpoint\n");
>> -			host1x_syncpt_free(fs_sp);
>> +			host1x_syncpt_put(fs_sp);
>>   			ret = -ENOMEM;
>>   			goto free_syncpts;
>>   		}
>>
>
Thierry Reding April 7, 2021, 3:03 p.m. UTC | #3
On Wed, Apr 07, 2021 at 04:45:34PM +0300, Mikko Perttunen wrote:
> On 7.4.2021 16.29, Hans Verkuil wrote:
> > On 02/04/2021 09:40, Bixuan Cui wrote:
> > > Fix the error:
> > > 
> > > drivers/staging/media/tegra-video/vi.c:1180:4:
> > > error: implicit declaration of function 'host1x_syncpt_free' [-Werror,-Wimplicit-function-declaration]
> > 
> > Against what tree is this being built? The mainline kernel doesn't have
> > host1x_syncpt_put, only host1x_syncpt_free.
> 
> This change was done only very recently, it's in linux-next and submitted
> for 5.13. I missed this one host1x_syncpt_free call in vi.c, but Thierry has
> already applied an equivalent patch on his end so the issue should be
> resolved.

Indeed, this should be fixed as of next-20210406. This is going in
through the DRM tree in order to keep the change atomic and bisectible.

Thierry
Bixuan Cui April 8, 2021, 1:37 a.m. UTC | #4
On 2021/4/7 21:45, Mikko Perttunen wrote:
> This change was done only very recently, it's in linux-next and submitted for 5.13. I missed this one host1x_syncpt_free call in vi.c, but Thierry has already applied an equivalent patch on his end so the issue should be resolved.

Yes,this build error has been fixed in the next-20210407.

Thanks,
Bixuan Cui
diff mbox series

Patch

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index 7e0cb5529b49..df5ca3596470 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1177,7 +1177,7 @@  static int tegra_channel_host1x_syncpt_init(struct tegra_vi_channel *chan)
 		mw_sp = host1x_syncpt_request(&vi->client, flags);
 		if (!mw_sp) {
 			dev_err(vi->dev, "failed to request memory ack syncpoint\n");
-			host1x_syncpt_free(fs_sp);
+			host1x_syncpt_put(fs_sp);
 			ret = -ENOMEM;
 			goto free_syncpts;
 		}