linux-next: build failure after merge of the v4l-dvb-next tree

linux-next: build failure after merge of the v4l-dvb-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/rc/ir_toy.c: In function 'irtoy_tx':
drivers/media/rc/ir_toy.c:332:36: error: 'STATE_RESET' undeclared (first use in this function)
  332 |        sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
      |                                    ^~~~~~~~~~~
drivers/media/rc/ir_toy.c:332:36: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  6a014f20734d ("media: ir_toy: allow tx carrier to be set")

interacting with commit

  f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")

from the v4l-vdb-fixes tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Sep 2021 10:14:37 +1000
Subject: [PATCH] fix for "media: ir_toy: allow tx carrier to be set"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/rc/ir_toy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/rc/ir_toy.c b/drivers/media/rc/ir_toy.c
index 9ea91d418635..71aced52248f 100644
--- a/drivers/media/rc/ir_toy.c
+++ b/drivers/media/rc/ir_toy.c
@@ -329,7 +329,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count)
 	// with its led on. It does not respond to any command when this
 	// happens. To work around this, re-enter sample mode.
 	err = irtoy_command(irtoy, COMMAND_SMODE_EXIT,
-			    sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
+			    sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);
 	if (err) {
 		dev_err(irtoy->dev, "exit sample mode: %d\n", err);
 		return err;
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb-next tree

[Sean Young]

Hi Mauro,

On Mon, Sep 20, 2021 at 10:19:48AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the v4l-dvb-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/rc/ir_toy.c: In function 'irtoy_tx':
> drivers/media/rc/ir_toy.c:332:36: error: 'STATE_RESET' undeclared (first use in this function)
>   332 |        sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
>       |                                    ^~~~~~~~~~~
> drivers/media/rc/ir_toy.c:332:36: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   6a014f20734d ("media: ir_toy: allow tx carrier to be set")

This commit renames STATE_RESET to STATE_COMMAND_NO_RESP.
 
> interacting with commit
> 
>   f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")

This commit uses STATE_RESET.

> from the v4l-vdb-fixes tree.
> 
> I have applied the following merge fix patch for today.

I'm not sure what the best solution is here. Once commit f0c15b360fb6 makes
it into Linus' tree and then is merged back into mediastage, commit
6a014f20734d can be rebased.

Thanks
Sean

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 20 Sep 2021 10:14:37 +1000
> Subject: [PATCH] fix for "media: ir_toy: allow tx carrier to be set"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/rc/ir_toy.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/rc/ir_toy.c b/drivers/media/rc/ir_toy.c
> index 9ea91d418635..71aced52248f 100644
> --- a/drivers/media/rc/ir_toy.c
> +++ b/drivers/media/rc/ir_toy.c
> @@ -329,7 +329,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count)
>  	// with its led on. It does not respond to any command when this
>  	// happens. To work around this, re-enter sample mode.
>  	err = irtoy_command(irtoy, COMMAND_SMODE_EXIT,
> -			    sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
> +			    sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);
>  	if (err) {
>  		dev_err(irtoy->dev, "exit sample mode: %d\n", err);
>  		return err;
> -- 
> 2.32.0
> 
> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb-next tree

[Hans Verkuil]

On 09/10/2023 11:25, Bryan O'Donoghue wrote:
> On 09/10/2023 01:08, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the v4l-dvb-next tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/media/platform/qcom/camss/camss.c: In function 'camss_probe':
>> drivers/media/platform/qcom/camss/camss.c:1634:17: error: label 'err_cleanup' used but not defined
>>   1634 |                 goto err_cleanup;
>>        |                 ^~~~
>>
>> Caused by commits
>>
>>    7405116519ad ("media: qcom: camss: Fix pm_domain_on sequence in probe")
>>    b278080a89f4 ("media: qcom: camss: Fix V4L2 async notifier error path")
>>
>> interacting with commit
>>
>>    2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe")
>>
>> from the v4l-dvb tree.
>>
>> I have applied the following merge resolution patch for today.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 9 Oct 2023 11:05:26 +1100
>> Subject: [PATCH] v4l-dvb-next: fix up for bad automatic merge.
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>   drivers/media/platform/qcom/camss/camss.c | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
>> index 38d20b12cdd8..8e78dd8d5961 100644
>> --- a/drivers/media/platform/qcom/camss/camss.c
>> +++ b/drivers/media/platform/qcom/camss/camss.c
>> @@ -1628,12 +1628,6 @@ static int camss_probe(struct platform_device *pdev)
>>           return ret;
>>       }
>>   -    ret = camss_configure_pd(camss);
>> -    if (ret < 0) {
>> -        dev_err(dev, "Failed to configure power domains: %d\n", ret);
>> -        goto err_cleanup;
>> -    }
>> -
>>       ret = camss_init_subdevices(camss);
>>       if (ret < 0)
>>           goto err_genpd_cleanup;
> 
> commit: f69791c39745e ("media: qcom: camss: Fix genpd cleanup") already appears in linux-next/master @ next-20231009 which commit: 2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in
> probe") depends on.
> 
> Already looks resolved.

There is a spurious patch committed in https://git.linuxtv.org/media_tree.git/log/

I'm not sure why it's there, but Mauro needs to drop that patch.

Regards,

	Hans

Re: linux-next: build failure after merge of the v4l-dvb-next tree

[Bryan O'Donoghue]

On 09/10/2023 01:08, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the v4l-dvb-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/platform/qcom/camss/camss.c: In function 'camss_probe':
> drivers/media/platform/qcom/camss/camss.c:1634:17: error: label 'err_cleanup' used but not defined
>   1634 |                 goto err_cleanup;
>        |                 ^~~~
> 
> Caused by commits
> 
>    7405116519ad ("media: qcom: camss: Fix pm_domain_on sequence in probe")
>    b278080a89f4 ("media: qcom: camss: Fix V4L2 async notifier error path")
> 
> interacting with commit
> 
>    2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe")
> 
> from the v4l-dvb tree.
> 
> I have applied the following merge resolution patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 9 Oct 2023 11:05:26 +1100
> Subject: [PATCH] v4l-dvb-next: fix up for bad automatic merge.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   drivers/media/platform/qcom/camss/camss.c | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 38d20b12cdd8..8e78dd8d5961 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -1628,12 +1628,6 @@ static int camss_probe(struct platform_device *pdev)
>   		return ret;
>   	}
>   
> -	ret = camss_configure_pd(camss);
> -	if (ret < 0) {
> -		dev_err(dev, "Failed to configure power domains: %d\n", ret);
> -		goto err_cleanup;
> -	}
> -
>   	ret = camss_init_subdevices(camss);
>   	if (ret < 0)
>   		goto err_genpd_cleanup;

commit: f69791c39745e ("media: qcom: camss: Fix genpd cleanup") already 
appears in linux-next/master @ next-20231009 which commit: 2c1bae27df78 
("media: qcom: camss: Fix pm_domain_on sequence in probe") depends on.

Already looks resolved.

---
bod

linux-next: build failure after merge of the v4l-dvb-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1654 bytes --]

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/platform/qcom/camss/camss.c: In function 'camss_probe':
drivers/media/platform/qcom/camss/camss.c:1634:17: error: label 'err_cleanup' used but not defined
 1634 |                 goto err_cleanup;
      |                 ^~~~

Caused by commits

  7405116519ad ("media: qcom: camss: Fix pm_domain_on sequence in probe")
  b278080a89f4 ("media: qcom: camss: Fix V4L2 async notifier error path")

interacting with commit

  2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe")

from the v4l-dvb tree.

I have applied the following merge resolution patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Oct 2023 11:05:26 +1100
Subject: [PATCH] v4l-dvb-next: fix up for bad automatic merge.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/platform/qcom/camss/camss.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 38d20b12cdd8..8e78dd8d5961 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -1628,12 +1628,6 @@ static int camss_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = camss_configure_pd(camss);
-	if (ret < 0) {
-		dev_err(dev, "Failed to configure power domains: %d\n", ret);
-		goto err_cleanup;
-	}
-
 	ret = camss_init_subdevices(camss);
 	if (ret < 0)
 		goto err_genpd_cleanup;
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2727 bytes --]

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/media/hantro/hantro_drv.c: In function 'device_run':
drivers/staging/media/hantro/hantro_drv.c:165:3: error: label 'err_cancel_job' used but not defined
  165 |   goto err_cancel_job;
      |   ^~~~
drivers/staging/media/hantro/hantro_drv.c: At top level:
drivers/staging/media/hantro/hantro_drv.c:168:2: warning: data definition has no type or storage class
  168 |  ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
      |  ^~~
drivers/staging/media/hantro/hantro_drv.c:168:2: error: type defaults to 'int' in declaration of 'ret' [-Werror=implicit-int]
drivers/staging/media/hantro/hantro_drv.c:168:24: error: 'ctx' undeclared here (not in a function)
  168 |  ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
      |                        ^~~
drivers/staging/media/hantro/hantro_drv.c:169:2: error: expected identifier or '(' before 'if'
  169 |  if (ret)
      |  ^~
drivers/staging/media/hantro/hantro_drv.c:172:2: warning: data definition has no type or storage class
  172 |  v4l2_m2m_buf_copy_metadata(src, dst, true);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/hantro/hantro_drv.c:172:2: error: type defaults to 'int' in declaration of 'v4l2_m2m_buf_copy_metadata' [-Werror=implicit-int]
drivers/staging/media/hantro/hantro_drv.c:172:2: warning: parameter names (without types) in function declaration
drivers/staging/media/hantro/hantro_drv.c:172:2: error: conflicting types for 'v4l2_m2m_buf_copy_metadata'
In file included from drivers/staging/media/hantro/hantro_drv.c:23:
include/media/v4l2-mem2mem.h:830:6: note: previous declaration of 'v4l2_m2m_buf_copy_metadata' was here
  830 | void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/hantro/hantro_drv.c:174:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '->' token
  174 |  ctx->codec_ops->run(ctx);
      |     ^~
drivers/staging/media/hantro/hantro_drv.c:175:2: error: expected identifier or '(' before 'return'
  175 |  return;
      |  ^~~~~~
drivers/staging/media/hantro/hantro_drv.c:177:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before ':' token
  177 | err_cancel_job:
      |               ^
drivers/staging/media/hantro/hantro_drv.c:179:1: error: expected identifier or '(' before '}' token
  179 | }
      | ^

Caused by commit

  9454974c75dd ("media: hantro: use pm_runtime_resume_and_get()")

I have used the v4l-dvb-next tree from next-20210519 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb-next tree

[Mauro Carvalho Chehab]

Em Wed, 3 Jun 2020 12:46:46 +1000
Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi all,
> 
> After merging the v4l-dvb-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_isr_thread':
> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:4196:9: error: 'atomisp_hw_is_isp2401' undeclared (first use in this function)
>  4196 |    if (!atomisp_hw_is_isp2401)
>       |         ^~~~~~~~~~~~~~~~~~~~~
> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:4196:9: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   be1fdab273a9 ("media: atomisp: change the detection of ISP2401 at runtime")
> 
> interacting with commit
> 
>   7ef17aa55fc3 ("media: atomisp: atomisp_compat_css20.c: detect ISP at runtime")
> 
> I have used the version of the v4l-dvb-next tree from next-20200602
> for today.

Sorry for that. 

The v4l-dvb-next currently contains some atomisp patches that are
waiting for review at linux-media, while v4l-dvb contains the patches
already reviewed, ready for merging.

The PR for v4l-dvb was submitted today.

I forgot to rebase v4l-dvb-next when some of the patches there 
were moved to v4l-dvb. Hopefully, it will be OK on tomorrow's 
linux-next, as I did the needed rebase.

Thanks,
Mauro

linux-next: build failure after merge of the v4l-dvb-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi all,

After merging the v4l-dvb-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_isr_thread':
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:4196:9: error: 'atomisp_hw_is_isp2401' undeclared (first use in this function)
 4196 |    if (!atomisp_hw_is_isp2401)
      |         ^~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:4196:9: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  be1fdab273a9 ("media: atomisp: change the detection of ISP2401 at runtime")

interacting with commit

  7ef17aa55fc3 ("media: atomisp: atomisp_compat_css20.c: detect ISP at runtime")

I have used the version of the v4l-dvb-next tree from next-20200602
for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]