linux-next: manual merge of the amdgpu tree with the drm-misc tree
Mark Brown
maintainerHi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
between commits:
2bcec01cf1055 ("drm/amdgpu_dm: Convert to atomic_create_state") 87882cd6debd9 ("drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict") b8bc58515ac49 ("drm/panic: Display panic screen via per-plane callback")
from the drm-misc tree and commits:
123f78c8fa9c1 ("drm/amd/display: Attach only plane updates that actually changed") 055593492a1f7 ("drm/amd/display: Test optional plane property creation") 48c78d2199c0f ("drm/amd/display: Test panic flush DCC teardown") 7352d162d0401 ("drm/amd/display: Test cursor update without DC stream") 128cf6682d2d3 ("drm/amd/display: Test accepted plane atomic check") 567aadce7e28a ("drm/amd/display: Test pre-GFX9 plane buffer attributes") 9e7ed95bfdd9f ("drm/amd/display: Test modifier list growth failure") 80065ab5bcf25 ("drm/amd/display: Test DCC reject for multi-plane format")
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.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +0 -0
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +0 -0
@@@ -3755,10 -4110,12 +4102,12 @@@ static struct kunit_case amdgpu_dm_planKUNIT_CASE (dm_test_atomic_check_helper_failure),KUNIT_CASE (dm_test_atomic_check_color_pipeline_conflict),KUNIT_CASE (dm_test_atomic_check_scaling_failure), +KUNIT_CASE (dm_test_atomic_check_success),/* amdgpu_dm_plane_panic_flush() */ KUNIT_CASE (dm_test_panic_flush_no_dc_state), +/* amdgpu_dm_plane_drm_plane_create_state() */ +KUNIT_CASE (dm_test_plane_create_state_initializes_state), +KUNIT_CASE (dm_test_panic_flush_disables_dcc), -/* amdgpu_dm_plane_drm_plane_reset() */ -KUNIT_CASE (dm_test_plane_reset_initializes_state),/* amdgpu_dm_plane_drm_plane_duplicate_state() */ KUNIT_CASE (dm_test_plane_duplicate_state_copies_fields), KUNIT_CASE(dm_test_plane_duplicate_state_copies_resources),
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +0 -1
@@ -842,7 +842,6 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,return 0 ; error_ism_fini: -amdgpu_dm_ism_fini (&acrtc->ism);drm_crtc_cleanup (&acrtc->base); fail:kfree (acrtc);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c +0 -2
@@ -1666,8 +1666,6 @@ static void dm_test_crtc_reset_state_replaces_existing(struct kunit *test) old->stream = stream; crtc->state = &old->base; -amdgpu_dm_crtc_reset_state (crtc); -/* Old state was destroyed (stream ref dropped) and a new one installed. */ KUNIT_EXPECT_EQ (test,kref_read (&stream->refcount),1 );KUNIT_EXPECT_NOT_NULL (test, crtc->state);