| Message ID | 20230530115752.14f0f1b5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-intel tree with the drm tree | expand |
Hi all, On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > @@@ -920,33 -587,8 +640,9 @@@ static const struct intel_device_info j > #define GEN12_FEATURES \ > GEN11_FEATURES, \ > GEN(12), \ > - .display.abox_mask = GENMASK(2, 1), \ > - .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ > - .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \ > - BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ > - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ > - .display.pipe_offsets = { \ > - [TRANSCODER_A] = PIPE_A_OFFSET, \ > - [TRANSCODER_B] = PIPE_B_OFFSET, \ > - [TRANSCODER_C] = PIPE_C_OFFSET, \ > - [TRANSCODER_D] = PIPE_D_OFFSET, \ > - [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ > - [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ > - }, \ > - .display.trans_offsets = { \ > - [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ > - [TRANSCODER_B] = TRANSCODER_B_OFFSET, \ > - [TRANSCODER_C] = TRANSCODER_C_OFFSET, \ > - [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ > - [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ > - [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ > - }, \ > - TGL_CURSOR_OFFSETS, \ > - TGL_CACHELEVEL, \ > ++ .max_pat_index = 3 \ I fixed the above up to have a ',' after the '3' > .has_global_mocs = 1, \ > - .has_pxp = 1, \ > - .display.has_dsb = 1, \ > - .max_pat_index = 3 > + .has_pxp = 1
diff --cc drivers/gpu/drm/i915/i915_pci.c index 75cbccd1a441,34bc732a6375..000000000000 --- a/drivers/gpu/drm/i915/i915_pci.c
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_pci.c between commit: 5e352e32aec2 ("drm/i915: preparation for using PAT index") from the drm tree and commits: 5af5169d7582 ("drm/i915: Convert INTEL_INFO()->display to a pointer") 18e0deeed8c8 ("drm/i915/display: Move display runtime info to display structure") from the drm-intel 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.