linux-next: manual merge of the drm-tegra tree with the drm tree

linux-next: manual merge of the drm-tegra tree with the drm tree

[broonie]

Hi all,

Today's linux-next merge of the drm-tegra tree got conflicts in:

  drivers/gpu/drm/tegra/dpaux.c
  drivers/gpu/drm/tegra/Kconfig

between commit:

  adb9d5a2cc77e ("drm/dp: Move DisplayPort helpers into separate helper module")

from the drm tree and commit:

  8913e1aea4b32 ("drm/tegra: dpaux: Populate AUX bus")

from the drm-tegra 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.

diff --cc drivers/gpu/drm/tegra/Kconfig
index 18c319b804c00,201f5175ecfec..0000000000000
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
  	depends on COMMON_CLK
  	depends on DRM
  	depends on OF
 +	select DRM_DP_HELPER
+ 	select DRM_DP_AUX_BUS
  	select DRM_KMS_HELPER
  	select DRM_MIPI_DSI
  	select DRM_PANEL
diff --cc drivers/gpu/drm/tegra/dpaux.c
index 8ca500977a46b,d7a731d287d23..0000000000000
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@@ -18,7 -18,8 +18,8 @@@
  #include <linux/reset.h>
  #include <linux/workqueue.h>
  
 -#include <drm/drm_dp_helper.h>
 -#include <drm/drm_dp_aux_bus.h>
 +#include <drm/dp/drm_dp_helper.h>
++#include <drm/dp/drm_dp_aux_bus.h>
  #include <drm/drm_panel.h>
  
  #include "dp.h"

Re: linux-next: manual merge of the drm-tegra tree with the drm tree

[Stephen Rothwell]

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

Hi all,

On Wed, 23 Feb 2022 16:30:07 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the drm-tegra tree got conflicts in:
> 
>   drivers/gpu/drm/tegra/dpaux.c
>   drivers/gpu/drm/tegra/Kconfig
> 
> between commit:
> 
>   adb9d5a2cc77e ("drm/dp: Move DisplayPort helpers into separate helper module")
> 
> from the drm tree and commit:
> 
>   8913e1aea4b32 ("drm/tegra: dpaux: Populate AUX bus")
> 
> from the drm-tegra 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.
> 
> diff --cc drivers/gpu/drm/tegra/Kconfig
> index 18c319b804c00,201f5175ecfec..0000000000000
> --- a/drivers/gpu/drm/tegra/Kconfig
> +++ b/drivers/gpu/drm/tegra/Kconfig
> @@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
>   	depends on COMMON_CLK
>   	depends on DRM
>   	depends on OF
>  +	select DRM_DP_HELPER
> + 	select DRM_DP_AUX_BUS
>   	select DRM_KMS_HELPER
>   	select DRM_MIPI_DSI
>   	select DRM_PANEL
> diff --cc drivers/gpu/drm/tegra/dpaux.c
> index 8ca500977a46b,d7a731d287d23..0000000000000
> --- a/drivers/gpu/drm/tegra/dpaux.c
> +++ b/drivers/gpu/drm/tegra/dpaux.c
> @@@ -18,7 -18,8 +18,8 @@@
>   #include <linux/reset.h>
>   #include <linux/workqueue.h>
>   
>  -#include <drm/drm_dp_helper.h>
>  -#include <drm/drm_dp_aux_bus.h>
>  +#include <drm/dp/drm_dp_helper.h>
> ++#include <drm/dp/drm_dp_aux_bus.h>
>   #include <drm/drm_panel.h>
>   
>   #include "dp.h"

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the drm-tegra tree with the drm tree

[Stephen Rothwell]

Hi Thierry,

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

  Documentation/gpu/index.rst

between commit:

  bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")

from the drm tree and commit:

  fa6d095eb23a ("drm/tegra: Add driver documentation")

from the drm-tegra 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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/gpu/index.rst
index 037a39ac1807,feae37fa7ca3..000000000000
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@@ -12,7 -12,7 +12,8 @@@ Linux GPU Driver Developer's Guid
     drm-uapi
     i915
     meson
 +   pl111
+    tegra
     tinydrm
     vc4
     vga-switcheroo

Re: linux-next: manual merge of the drm-tegra tree with the drm tree

[Thierry Reding]

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

On Tue, Mar 21, 2017 at 11:45:45AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drm-tegra tree got a conflict in:
> 
>   drivers/gpu/drm/tegra/drm.c
> 
> between commit:
> 
>   10437d9b475e ("drm: tegra: use vblank hooks in struct drm_crtc_funcs")
> 
> from the drm tree and commit:
> 
>   3f2ea8cee24f ("drm/tegra: Don't leak kernel pointer to userspace")
> 
> from the drm-tegra 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.

Stephen,

your resolution looks good to me.

Dave,

the conflict is fairly trivial to resolve, but if you prefer I can
rebase the Tegra tree onto your -next to avoid it.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

linux-next: manual merge of the drm-tegra tree with the drm tree

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/tegra/drm.c

between commit:

  10437d9b475e ("drm: tegra: use vblank hooks in struct drm_crtc_funcs")

from the drm tree and commit:

  3f2ea8cee24f ("drm/tegra: Don't leak kernel pointer to userspace")

from the drm-tegra 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/tegra/drm.c
index dba4e090d3df,3f8bd7bd6532..000000000000
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@@ -804,6 -864,49 +864,15 @@@ static const struct file_operations teg
  	.llseek = noop_llseek,
  };
  
 -static u32 tegra_drm_get_vblank_counter(struct drm_device *drm,
 -					unsigned int pipe)
 -{
 -	struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);
 -	struct tegra_dc *dc = to_tegra_dc(crtc);
 -
 -	if (!crtc)
 -		return 0;
 -
 -	return tegra_dc_get_vblank_counter(dc);
 -}
 -
 -static int tegra_drm_enable_vblank(struct drm_device *drm, unsigned int pipe)
 -{
 -	struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);
 -	struct tegra_dc *dc = to_tegra_dc(crtc);
 -
 -	if (!crtc)
 -		return -ENODEV;
 -
 -	tegra_dc_enable_vblank(dc);
 -
 -	return 0;
 -}
 -
 -static void tegra_drm_disable_vblank(struct drm_device *drm, unsigned int pipe)
 -{
 -	struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);
 -	struct tegra_dc *dc = to_tegra_dc(crtc);
 -
 -	if (crtc)
 -		tegra_dc_disable_vblank(dc);
 -}
 -
+ static int tegra_drm_context_cleanup(int id, void *p, void *data)
+ {
+ 	struct tegra_drm_context *context = p;
+ 
+ 	tegra_drm_context_free(context);
+ 
+ 	return 0;
+ }
+ 
  static void tegra_drm_preclose(struct drm_device *drm, struct drm_file *file)
  {
  	struct tegra_drm_file *fpriv = file->driver_priv;