Linux-Next discussions
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Adrian Betschart <adrian.betschart@cinemaone.ch>,
	Alex Deucher <alexander.deucher@amd.com>,
	Dave Airlie <airlied@redhat.com>,
	Davey Hughes <davidralphhughes@gmail.com>,
	DRI <dri-devel@lists.freedesktop.org>,
	Fangzhi Zuo <jerry.zuo@amd.com>, Hugo Sales <hugo@hsal.es>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Wayne Lin <wayne.lin@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-fixes tree
Date: Fri, 20 Nov 2026 15:40:52 +0000	[thread overview]
Message-ID: <awBqBGP_igDMIjAm@sirena.org.uk> (raw)

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

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commits:

  406a850b0dd28 ("drm/amd/display: Move HDMI FRL Polling Outside dc_lock")
  449141afc84a4 ("drm/amd/display: Stop HDMI FRL status polling on fini")
  09b6bf1a04cc6 ("drm/amd/display: Take every stream out of self-refresh before a modeset")
  6fd6e75162065 ("drm/amd/display: Apply the HDMI RGB range default only to HDMI signals")
  fff46a322847a ("drm/amd/display: Keep FreeSync flip timing across plane resets")

from the drm-fixes tree and commits:

  e2830fb628915 ("drm/amd/display: Test FreeSync flip timing across plane resets")
  4acf82d2a2dcc ("drm/amd/display: Keep FreeSync flip timing across plane resets")
  39f37a2346410 ("drm/amd/display: Apply the HDMI RGB range default only to HDMI signals")
  acf94b17b1243 ("drm/amdgpu: remove legacy non-DC display support code")
  5d90fdb959505 ("drm/amd/display: Take every stream out of self-refresh before a modeset")
  709b7a5aff3ad ("drm/amd/display: Stop HDMI FRL status polling on fini")
  7a1807cd11a8c ("drm/amd/display: Move HDMI FRL Polling Outside dc_lock")

from the amdgpu 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 --combined drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 3cf2e2fdab04d,2dbea24e93e60..0000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -2728,15 -2728,8 +2728,8 @@@ EXPORT_IF_KUNIT(dm_bandwidth_update)
  static const struct amdgpu_display_funcs dm_display_funcs = {
  	.bandwidth_update = dm_bandwidth_update, /* called unconditionally */
  	.vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */
- 	.backlight_set_level = NULL, /* never called for DC */
- 	.backlight_get_level = NULL, /* never called for DC */
- 	.hpd_sense = NULL,/* called unconditionally */
- 	.hpd_set_polarity = NULL, /* called unconditionally */
- 	.hpd_get_gpio_reg = NULL, /* VBIOS parsing. DAL does it. */
  	.page_flip_get_scanoutpos =
  		dm_crtc_get_scanoutpos,/* called unconditionally */
- 	.add_encoder = NULL, /* VBIOS parsing. DAL does it. */
- 	.add_connector = NULL, /* VBIOS parsing. DAL does it. */
  };
  
  #if defined(CONFIG_DEBUG_KERNEL_DC)
@@@ -3854,7 -3847,7 +3847,7 @@@ EXPORT_IF_KUNIT(dm_arm_vblank_event_pre
   * this at commit time, not in atomic check: by then the previous commit
   * has finished writing it.
   */
- static void
+ STATIC_IFN_KUNIT void
  dm_plane_inherit_flip_time(struct dc_plane_state *dc_plane_state,
  			   struct drm_plane_state *old_plane_state,
  			   struct drm_plane_state *new_plane_state)
@@@ -3866,6 -3859,7 +3859,7 @@@
  	    old_plane_state->crtc == new_plane_state->crtc)
  		dc_plane_state->time = old_dc_plane_state->time;
  }
+ EXPORT_IF_KUNIT(dm_plane_inherit_flip_time);
  
  static void amdgpu_dm_commit_planes(struct drm_atomic_commit *state,
  				    struct drm_device *dev,

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

             reply	other threads:[~2026-11-20 15:40 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 15:40 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-11-13 16:07 linux-next: manual merge of the amdgpu tree with the drm-fixes tree Mark Brown
2026-09-18 11:49 Mark Brown
2026-06-08 11:29 Mark Brown
2026-03-05 13:37 Mark Brown
2026-02-27 14:00 Mark Brown
2021-07-23  2:58 Stephen Rothwell
2021-07-23  3:08 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=awBqBGP_igDMIjAm@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=adrian.betschart@cinemaone.ch \
    --cc=airlied@redhat.com \
    --cc=alexander.deucher@amd.com \
    --cc=alexdeucher@gmail.com \
    --cc=davidralphhughes@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hugo@hsal.es \
    --cc=jerry.zuo@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=wayne.lin@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox