Skip to contentSkip to conversation

linux-next: manual merge of the opp tree with the v4l-dvb tree

DISCUSSION Stephen Rothwell 3 participants 5 messages Mar 23, 2021 – Mar 25, 2021 Linux-next tree

lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

Today's linux-next merge of the opp tree got a conflict in:

drivers/media/platform/qcom/venus/pm_helpers.c

between commit:

08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error")

from the v4l-dvb tree and commit:

857219ae4043 ("media: venus: Convert to use resource-managed OPP API")

from the opp tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

Signature · 79 lines
Cheers,
Stephen Rothwell

diff --cc drivers/media/platform/qcom/venus/pm_helpers.c
index e349d01422c5,e61317220b9a..000000000000
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@@ -750,12 -753,11 +750,11 @@@ static int venc_power_v4(struct device 
  	return ret;
  }
  
 -static int vcodec_domains_get(struct device *dev)
 +static int vcodec_domains_get(struct venus_core *core)
  {
  	int ret;
- 	struct opp_table *opp_table;
  	struct device **opp_virt_dev;
 -	struct venus_core *core = dev_get_drvdata(dev);
 +	struct device *dev = core->dev;
  	const struct venus_resources *res = core->res;
  	struct device *pd;
  	unsigned int i;
@@@ -826,13 -825,11 +821,11 @@@ skip_pmdomains
  
  	if (core->opp_dl_venus)
  		device_link_del(core->opp_dl_venus);
- 
- 	dev_pm_opp_detach_genpd(core->opp_table);
  }
  
 -static int core_get_v4(struct device *dev)
 +static int core_get_v4(struct venus_core *core)
  {
 -	struct venus_core *core = dev_get_drvdata(dev);
 +	struct device *dev = core->dev;
  	const struct venus_resources *res = core->res;
  	int ret;
  
@@@ -871,35 -867,24 +863,24 @@@
  		}
  	}
  
 -	ret = vcodec_domains_get(dev);
 +	ret = vcodec_domains_get(core);
- 	if (ret) {
- 		if (core->has_opp_table)
- 			dev_pm_opp_of_remove_table(dev);
- 		dev_pm_opp_put_clkname(core->opp_table);
+ 	if (ret)
  		return ret;
- 	}
  
  	return 0;
  }
  
 -static void core_put_v4(struct device *dev)
 +static void core_put_v4(struct venus_core *core)
  {
- 	struct device *dev = core->dev;
- 
  	if (legacy_binding)
  		return;
  
 -	vcodec_domains_put(dev);
 +	vcodec_domains_put(core);
- 
- 	if (core->has_opp_table)
- 		dev_pm_opp_of_remove_table(dev);
- 	dev_pm_opp_put_clkname(core->opp_table);
- 
  }
  
 -static int core_power_v4(struct device *dev, int on)
 +static int core_power_v4(struct venus_core *core, int on)
  {
 -	struct venus_core *core = dev_get_drvdata(dev);
 +	struct device *dev = core->dev;
  	struct device *pmctrl = core->pmdomains[0];
  	int ret = 0;
#1 lore raw

Thanks Stephen!

Quoted 14 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the opp tree got a conflict in:

drivers/media/platform/qcom/venus/pm_helpers.c

between commit:

08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error")

from the v4l-dvb tree and commit:

857219ae4043 ("media: venus: Convert to use resource-managed OPP API")

Quoted 9 lines

from the opp tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

I don't know what is the best solution here.

Viresh, Can I take the OPP API changes through media-tree to avoid conflicts?

Signature · 2 lines
regards,
Stan
#2 lore raw
Quoted 27 lines · Stanimir Varbanov

Thanks Stephen!

Quoted 14 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the opp tree got a conflict in:

drivers/media/platform/qcom/venus/pm_helpers.c

between commit:

08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error")

from the v4l-dvb tree and commit:

857219ae4043 ("media: venus: Convert to use resource-managed OPP API")

Quoted 9 lines

from the opp tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

Quoted 4 lines

I don't know what is the best solution here.

Viresh, Can I take the OPP API changes through media-tree to avoid conflicts?

I already suggested something similar earlier, and I was expecting Thierry to respond to that.. Not sure who should pick those patches.

https://lore.kernel.org/lkml/20210318103250.shjyd66pxw2g2nsd@vireshk-i7/

Can you please respond to this series then ?

Signature · 1 line
viresh
#3 lore raw

Hi Viresh,

Quoted 30 lines · Viresh Kumar
Quoted 29 lines · Stanimir Varbanov

Thanks Stephen!

Quoted 14 lines · Stephen Rothwell

Hi all,

Today's linux-next merge of the opp tree got a conflict in:

drivers/media/platform/qcom/venus/pm_helpers.c

between commit:

08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error")

from the v4l-dvb tree and commit:

857219ae4043 ("media: venus: Convert to use resource-managed OPP API")

Quoted 9 lines

from the opp tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

I don't know what is the best solution here.

Quoted 7 lines
Quoted 2 lines

Viresh, Can I take the OPP API changes through media-tree to avoid conflicts?

I already suggested something similar earlier, and I was expecting Thierry to respond to that.. Not sure who should pick those patches.

https://lore.kernel.org/lkml/20210318103250.shjyd66pxw2g2nsd@vireshk-i7/

I guess you meant this thread.

https://lore.kernel.org/lkml/[email protected]/

Quoted 3 lines

Can you please respond to this series then ?

Done.

Signature · 2 lines
regards,
Stan