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

Hi all,

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

On Fri, 22 Mar 2019 10:57:28 +1100 Stephen Rothwell sfr@canb.auug.org.au wrote:

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

drivers/gpu/drm/i915/gvt/mmio_context.c

between commit:

1e8b15a1988e ("drm/i915/gvt: Add in context mmio 0x20D8 to gen9 mmio list")

from the drm-intel-fixes tree and commit:

8a68d464366e ("drm/i915: Store the BIT(engine->id) as the engine's mask")

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.

diff --cc drivers/gpu/drm/i915/gvt/mmio_context.c index 7902fb162d09,a00a807a1d55..000000000000 --- a/drivers/gpu/drm/i915/gvt/mmio_context.c +++ b/drivers/gpu/drm/i915/gvt/mmio_context.c @@@ -73,71 -73,70 +73,71 @@@ static struct engine_mmio gen8_engine_m };

static struct engine_mmio gen9_engine_mmio_list[] __cacheline_aligned = {

• {RCS, GFX_MODE_GEN7, 0xffff, false}, /* 0x229c */
• {RCS, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
• {RCS, HWSTAM, 0x0, false}, /* 0x2098 */
• {RCS, INSTPM, 0xffff, true}, /* 0x20c0 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 0), 0, false}, /* 0x24d0 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 1), 0, false}, /* 0x24d4 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 2), 0, false}, /* 0x24d8 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 3), 0, false}, /* 0x24dc */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 4), 0, false}, /* 0x24e0 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 5), 0, false}, /* 0x24e4 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 6), 0, false}, /* 0x24e8 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 7), 0, false}, /* 0x24ec */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 8), 0, false}, /* 0x24f0 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 9), 0, false}, /* 0x24f4 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 10), 0, false}, /* 0x24f8 */
• {RCS, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 11), 0, false}, /* 0x24fc */
• {RCS, CACHE_MODE_1, 0xffff, true}, /* 0x7004 */
• {RCS, GEN7_GT_MODE, 0xffff, true}, /* 0x7008 */
• {RCS, CACHE_MODE_0_GEN7, 0xffff, true}, /* 0x7000 */
• {RCS, GEN7_COMMON_SLICE_CHICKEN1, 0xffff, true}, /* 0x7010 */
• {RCS, HDC_CHICKEN0, 0xffff, true}, /* 0x7300 */
• {RCS, VF_GUARDBAND, 0xffff, true}, /* 0x83a4 */
• {RCS, GEN8_PRIVATE_PAT_LO, 0, false}, /* 0x40e0 */
• {RCS, GEN8_PRIVATE_PAT_HI, 0, false}, /* 0x40e4 */
• {RCS, GEN8_CS_CHICKEN1, 0xffff, true}, /* 0x2580 */
• {RCS, COMMON_SLICE_CHICKEN2, 0xffff, true}, /* 0x7014 */
• {RCS, GEN9_CS_DEBUG_MODE1, 0xffff, false}, /* 0x20ec */
• {RCS, GEN8_L3SQCREG4, 0, false}, /* 0xb118 */
• {RCS, GEN7_HALF_SLICE_CHICKEN1, 0xffff, true}, /* 0xe100 */
• {RCS, HALF_SLICE_CHICKEN2, 0xffff, true}, /* 0xe180 */
• {RCS, HALF_SLICE_CHICKEN3, 0xffff, true}, /* 0xe184 */
• {RCS, GEN9_HALF_SLICE_CHICKEN5, 0xffff, true}, /* 0xe188 */
• {RCS, GEN9_HALF_SLICE_CHICKEN7, 0xffff, true}, /* 0xe194 */
• {RCS, GEN8_ROW_CHICKEN, 0xffff, true}, /* 0xe4f0 */
• {RCS, TRVATTL3PTRDW(0), 0, false}, /* 0x4de0 */
• {RCS, TRVATTL3PTRDW(1), 0, false}, /* 0x4de4 */
• {RCS, TRNULLDETCT, 0, false}, /* 0x4de8 */
• {RCS, TRINVTILEDETCT, 0, false}, /* 0x4dec */
• {RCS, TRVADR, 0, false}, /* 0x4df0 */
• {RCS, TRTTE, 0, false}, /* 0x4df4 */
• {BCS, RING_GFX_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2229c */
• {BCS, RING_MI_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2209c */
• {BCS, RING_INSTPM(BLT_RING_BASE), 0xffff, false}, /* 0x220c0 */
• {BCS, RING_HWSTAM(BLT_RING_BASE), 0x0, false}, /* 0x22098 */
• {BCS, RING_EXCC(BLT_RING_BASE), 0x0, false}, /* 0x22028 */
• {VCS2, RING_EXCC(GEN8_BSD2_RING_BASE), 0xffff, false}, /* 0x1c028 */
• {VECS, RING_EXCC(VEBOX_RING_BASE), 0xffff, false}, /* 0x1a028 */
• {RCS, GEN8_HDC_CHICKEN1, 0xffff, true}, /* 0x7304 */
• {RCS, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
• {RCS, GEN7_UCGCTL4, 0x0, false}, /* 0x940c */
• {RCS, GAMT_CHKN_BIT_REG, 0x0, false}, /* 0x4ab8 */
• {RCS, GEN9_GAMT_ECO_REG_RW_IA, 0x0, false}, /* 0x4ab0 */
• {RCS, GEN9_CSFE_CHICKEN1_RCS, 0xffff, false}, /* 0x20d4 */
• {RCS, _MMIO(0x20D8), 0xffff, true}, /* 0x20d8 */
• {RCS, GEN8_GARBCNTL, 0x0, false}, /* 0xb004 */
• {RCS, GEN7_FF_THREAD_MODE, 0x0, false}, /* 0x20a0 */
• {RCS, FF_SLICE_CS_CHICKEN2, 0xffff, false}, /* 0x20e4 */
• {RCS, INVALID_MMIO_REG, 0, false } /* Terminated */

• {RCS0, GFX_MODE_GEN7, 0xffff, false}, /* 0x229c */
• {RCS0, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
• {RCS0, HWSTAM, 0x0, false}, /* 0x2098 */
• {RCS0, INSTPM, 0xffff, true}, /* 0x20c0 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 0), 0, false}, /* 0x24d0 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 1), 0, false}, /* 0x24d4 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 2), 0, false}, /* 0x24d8 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 3), 0, false}, /* 0x24dc */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 4), 0, false}, /* 0x24e0 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 5), 0, false}, /* 0x24e4 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 6), 0, false}, /* 0x24e8 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 7), 0, false}, /* 0x24ec */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 8), 0, false}, /* 0x24f0 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 9), 0, false}, /* 0x24f4 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 10), 0, false}, /* 0x24f8 */
• {RCS0, RING_FORCE_TO_NONPRIV(RENDER_RING_BASE, 11), 0, false}, /* 0x24fc */
• {RCS0, CACHE_MODE_1, 0xffff, true}, /* 0x7004 */
• {RCS0, GEN7_GT_MODE, 0xffff, true}, /* 0x7008 */
• {RCS0, CACHE_MODE_0_GEN7, 0xffff, true}, /* 0x7000 */
• {RCS0, GEN7_COMMON_SLICE_CHICKEN1, 0xffff, true}, /* 0x7010 */
• {RCS0, HDC_CHICKEN0, 0xffff, true}, /* 0x7300 */
• {RCS0, VF_GUARDBAND, 0xffff, true}, /* 0x83a4 */
• {RCS0, GEN8_PRIVATE_PAT_LO, 0, false}, /* 0x40e0 */
• {RCS0, GEN8_PRIVATE_PAT_HI, 0, false}, /* 0x40e4 */
• {RCS0, GEN8_CS_CHICKEN1, 0xffff, true}, /* 0x2580 */
• {RCS0, COMMON_SLICE_CHICKEN2, 0xffff, true}, /* 0x7014 */
• {RCS0, GEN9_CS_DEBUG_MODE1, 0xffff, false}, /* 0x20ec */
• {RCS0, GEN8_L3SQCREG4, 0, false}, /* 0xb118 */
• {RCS0, GEN7_HALF_SLICE_CHICKEN1, 0xffff, true}, /* 0xe100 */
• {RCS0, HALF_SLICE_CHICKEN2, 0xffff, true}, /* 0xe180 */
• {RCS0, HALF_SLICE_CHICKEN3, 0xffff, true}, /* 0xe184 */
• {RCS0, GEN9_HALF_SLICE_CHICKEN5, 0xffff, true}, /* 0xe188 */
• {RCS0, GEN9_HALF_SLICE_CHICKEN7, 0xffff, true}, /* 0xe194 */
• {RCS0, GEN8_ROW_CHICKEN, 0xffff, true}, /* 0xe4f0 */
• {RCS0, TRVATTL3PTRDW(0), 0, false}, /* 0x4de0 */
• {RCS0, TRVATTL3PTRDW(1), 0, false}, /* 0x4de4 */
• {RCS0, TRNULLDETCT, 0, false}, /* 0x4de8 */
• {RCS0, TRINVTILEDETCT, 0, false}, /* 0x4dec */
• {RCS0, TRVADR, 0, false}, /* 0x4df0 */
• {RCS0, TRTTE, 0, false}, /* 0x4df4 */
• {BCS0, RING_GFX_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2229c */
• {BCS0, RING_MI_MODE(BLT_RING_BASE), 0xffff, false}, /* 0x2209c */
• {BCS0, RING_INSTPM(BLT_RING_BASE), 0xffff, false}, /* 0x220c0 */
• {BCS0, RING_HWSTAM(BLT_RING_BASE), 0x0, false}, /* 0x22098 */
• {BCS0, RING_EXCC(BLT_RING_BASE), 0x0, false}, /* 0x22028 */
• {VCS1, RING_EXCC(GEN8_BSD2_RING_BASE), 0xffff, false}, /* 0x1c028 */
• {VECS0, RING_EXCC(VEBOX_RING_BASE), 0xffff, false}, /* 0x1a028 */
• {RCS0, GEN8_HDC_CHICKEN1, 0xffff, true}, /* 0x7304 */
• {RCS0, GEN9_CTX_PREEMPT_REG, 0x0, false}, /* 0x2248 */
• {RCS0, GEN7_UCGCTL4, 0x0, false}, /* 0x940c */
• {RCS0, GAMT_CHKN_BIT_REG, 0x0, false}, /* 0x4ab8 */
• {RCS0, GEN9_GAMT_ECO_REG_RW_IA, 0x0, false}, /* 0x4ab0 */
• {RCS0, GEN9_CSFE_CHICKEN1_RCS, 0xffff, false}, /* 0x20d4 */

++ {RCS0, _MMIO(0x20D8), 0xffff, true}, /* 0x20d8 */

• {RCS0, GEN8_GARBCNTL, 0x0, false}, /* 0xb004 */

• {RCS0, GEN7_FF_THREAD_MODE, 0x0, false}, /* 0x20a0 */

• {RCS0, FF_SLICE_CS_CHICKEN2, 0xffff, false}, /* 0x20e4 */

• {RCS0, INVALID_MMIO_REG, 0, false } /* Terminated */ };

  static struct {