linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/ast/ast_drv.h

between commit:

  0ce91928ec62 ("drm/ast: astdp: Wake up during connector status detection")

from the drm-misc-fixes tree and commit:

  c91d75a3c6a2 ("drm/ast: astdp: Test firmware status once during probing")

from the drm-misc 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/ast/ast_drv.h
index 47bab5596c16,b54a89676e9f..000000000000
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@@ -471,9 -471,9 +471,10 @@@ void ast_init_3rdtx(struct drm_device *
  /* aspeed DP */
  bool ast_astdp_is_connected(struct ast_device *ast);
  int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata);
- void ast_dp_launch(struct drm_device *dev);
+ int ast_dp_launch(struct ast_device *ast);
 +bool ast_dp_power_is_on(struct ast_device *ast);
  void ast_dp_power_on_off(struct drm_device *dev, bool no);
+ void ast_dp_link_training(struct ast_device *ast);
  void ast_dp_set_on_off(struct drm_device *dev, bool no);
  void ast_dp_set_mode(struct drm_crtc *crtc, struct ast_vbios_mode_info *vbios_mode);
  

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

linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/panthor/panthor_drv.c

between commit:

  2b55639a4e25 ("drm/panthor: Add FOP_UNSIGNED_OFFSET to fop_flags")

from the drm-misc-fixes tree and commit:

  e16635d88fa0 ("drm/panthor: add DRM fdinfo support")

from the drm-misc 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/panthor/panthor_drv.c
index c520f156e2d7,f9b93f84d611..000000000000
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@@ -1383,7 -1476,7 +1476,8 @@@ static const struct file_operations pan
  	.read = drm_read,
  	.llseek = noop_llseek,
  	.mmap = panthor_mmap,
 +	.fop_flags = FOP_UNSIGNED_OFFSET,
+ 	.show_fdinfo = drm_show_fdinfo,
  };
  
  #ifdef CONFIG_DEBUG_FS

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

linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  include/drm/drm_kunit_helpers.h

between commit:

  13c1d5f3a7fa ("drm/tests: helpers: Create kunit helper to destroy a drm_display_mode")

from the drm-misc-fixes tree and commit:

  e4e3de631d14 ("drm/tests: helpers: Create new helper to enable output")

from the drm-misc 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 include/drm/drm_kunit_helpers.h
index 1c62d1d4458c,1cda7281f300..000000000000
--- a/include/drm/drm_kunit_helpers.h
+++ b/include/drm/drm_kunit_helpers.h
@@@ -118,9 -119,13 +119,16 @@@ drm_kunit_helper_create_crtc(struct kun
  			     const struct drm_crtc_funcs *funcs,
  			     const struct drm_crtc_helper_funcs *helper_funcs);
  
+ int drm_kunit_helper_enable_crtc_connector(struct kunit *test,
+ 					   struct drm_device *drm,
+ 					   struct drm_crtc *crtc,
+ 					   struct drm_connector *connector,
+ 					   const struct drm_display_mode *mode,
+ 					   struct drm_modeset_acquire_ctx *ctx);
+ 
 +int drm_kunit_add_mode_destroy_action(struct kunit *test,
 +				      struct drm_display_mode *mode);
 +
  struct drm_display_mode *
  drm_kunit_display_mode_from_cea_vic(struct kunit *test, struct drm_device *dev,
  				    u8 video_code);

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

linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/vc4/vc4_hdmi.c

between commit:

  c0317ad44f45 ("drm/vc4: fix infinite EPROBE_DEFER loop")

from the drm-misc-fixes tree and commit:

  d9f9bae6752f ("drm/bridge: allow limiting I2S formats")

from the drm-misc tree.

I fixed it up (the former removes code updated by the latter, so I just
removed the code) 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

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

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

[Stephen Rothwell]

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

Hi all,

On Wed, 11 Jun 2025 12:08:01 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/vc4/vc4_hdmi.c
> 
> between commit:
> 
>   c0317ad44f45 ("drm/vc4: fix infinite EPROBE_DEFER loop")
> 
> from the drm-misc-fixes tree and commit:
> 
>   d9f9bae6752f ("drm/bridge: allow limiting I2S formats")
> 
> from the drm-misc tree.
> 
> I fixed it up (the former removes code updated by the latter, so I just
> removed the code) 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.

Actually, the code was moved, not removed, so it needs the below merge
fix up.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 163d092bd973,4797ed1c21f4..000000000000
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -2285,12 -2291,6 +2285,12 @@@ static int vc4_hdmi_audio_init(struct v
  		return ret;
  	}
  
 +	ret = drm_connector_hdmi_audio_init(&vc4_hdmi->connector, dev,
- 					    &vc4_hdmi_audio_funcs, 8, false,
++					    &vc4_hdmi_audio_funcs, 8, 0, false,
 +					    -1);
 +	if (ret)
 +		return ret;
 +
  	dai_link->cpus		= &vc4_hdmi->audio.cpu;
  	dai_link->codecs	= &vc4_hdmi->audio.codec;
  	dai_link->platforms	= &vc4_hdmi->audio.platform;

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