Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

On Tue, 03 Oct 2023, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.h > > between commits: > > c9517783060a ("drm/i915/dg2: Drop Wa_16011777198") > 5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_ST

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commits: c9517783060a ("drm/i915/dg2: Drop Wa_16011777198") 5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP") 81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP")

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell 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(

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 66ca1d8f222b ("drm/i915/i915_drv: Use i915 instead of dev_priv insied the file_priv structure") from the drm tree and commits: 5af5169d7582 ("drm/i915: Convert INTE

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

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") 18e

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: f67986b0119c ("drm/i915/pxp: Promote pxp subsystem to top-level of i915") from the drm tree and commit: a3f839762ceb ("drm/i915: move pch_ssc_use to display sub-stru

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 3bb6a44251b4 ("drm/i915: Rename ggtt_view as gtt_view") from the drm tree and commit: 5fd5cc73e449 ("drm/i915: split out i915_gem.c declarations to i915_gem.h") fro

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: 254e5e8829a9 ("drm: Remove unnecessary include statements of drm_plane_helper.h") from the drm tree and commit: 42a0d256496f ("drm/i915: Extract skl_watermark.c")

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_module.c between commit: 6387a3c4b0c4 ("drm: move the buddy allocator from i915 into common drm") from the drm tree and commit: 24524e3f43cf ("drm/i915: move the DRIVER_* macros to i915_d

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: include/linux/dma-buf-map.h between commit: e8c1f36157ce ("dma-buf-map: Fix dot vs comma in example") from the drm tree and commit: 7938f4218168 ("dma-buf-map: Rename to iosys-map") from the drm-intel tree. I fi

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_device_info.h between commit: 3ffe82d701a4 ("drm/i915/xehp: handle new steering options") from the drm tree and commit: 22e26af76903 ("drm/i915: Fork DG1 interrupt handler") from the dr

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi Am 14.05.21 um 03:53 schrieb Stephen Rothwell: Hi all, On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell wrote: On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell wrote: On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell wrote: Today's linux-next merge of the drm-intel tree g

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell wrote: > > On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell > wrote: > > > > On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > >

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell wrote: > > On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i915/display/intel_sprite.c > > > > between commit: > > >

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display.c between commit: 1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") from the drm tree and commit: 61169987c4d9 ("drm/i915: Unify the FB and plane state

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_sprite.c > > between commit: > > 92f1d09ca4ed ("drm: Switch to %p4cc format modifier") > > from the drm tree and

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_sprite.c between commit: 92f1d09ca4ed ("drm: Switch to %p4cc format modifier") from the drm tree and commit: 46d12f911821 ("drm/i915: migrate skl planes code new file (v5)") fro

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_object.h between commit: 41a9c75d0acf ("drm/i915/gem: Move stolen node into GEM object union") from the drm tree and commit: 5fbc2c2bfa5c ("drm/i915/gem: Add a helper to read data

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/drm_probe_helper.c between commit: 12c683e12cd8 ("drm: bridge: Pass drm_display_info to drm_bridge_funcs .mode_valid()") from the drm tree and commit: 1c26b8e09004 ("drm/probe_helper: Add drm_con

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_vma.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm tree and commit: cd2a4eaf8c79 ("drm/i915: Report resv_obj allocation failure") from the

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

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: fcd70cd36b9b ("drm: Split out drm_probe_helper.h") from the drm tree and commit: 5f5c139d6900 ("drm/i915: Allocate active tracking nodes from a slabcache") from the

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: dd847a706974 ("drm/i915: Compile fix for 64b dma-fence seqno") from the drm tree and commit: 9f58892ea996 ("drm/i915: Pull all the reset functionality together into

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_dp_mst.c between commit: f424f55e3177 ("drm/i915: Track MST link bandwidth") from the drm tree and commit: 3d65a735d834 ("drm/i915/mst: use max link not sink lane count") from the drm-i

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: include/drm/drmP.h between commit: c4e68a583202 ("drm: Introduce DRM_DEV_* log messages") from the drm tree and commit: 30b0da8d556e ("drm: extra printk() wrapper macros") from the drm-intel tree. I fixed it up

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

On Wed, Jul 23, 2014 at 5:06 AM, Stephen Rothwell wrote: > P.S. Daniel, that drm-intel tree commit has no Signed-off-by from its > author ... Oops, fixed. Thanks for pointing this out. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit b19729617929 ("drm/i915: fix psr match conditions screw ups") from the drm tree and commit 24acaf94ed4a ("drm/i915: Fix up PSR frontbuffer tracking") from the drm-intel tree. I

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit d05410f9a450 ("drm/i915: split conversion function out into separate function") from the drm tree and commit 6b09e72050b4 ("drm/i915: Power gating display wells during i915_

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit f4510a2752b7 ("drm: Replace crtc fb with primary plane fb (v3)") from the drm tree and commit 262ca2b08fbd ("drm/i915: Rename similar plane functions to avoid confusion") fr

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

On Wed, Jan 22, 2014 at 5:21 PM, Olof Johansson wrote: > On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter wrote: >> Hi Stephen, >> >> On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell >> wrote: >>> Hi all, >>> >>> Today's linux-next merge of the drm-intel tree got a conflict in >>> drivers/gpu/dr

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter wrote: > Hi Stephen, > > On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell > wrote: >> Hi all, >> >> Today's linux-next merge of the drm-intel tree got a conflict in >> drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass >> 'flag

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi Stephen, On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in > drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass > 'flags' from the caller to .get_scanout_position()") from the drm tree >

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit c326c0a9c98c ("drm/i915: Call drm_calc_timestamping_constants() earlier") from the drm tree and commit bbee18af2a25 ("drm/i915: Prepare to track new pipe config per pipe") f

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass 'flags' from the caller to .get_scanout_position()") from the drm tree and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from the drm-i

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_panel.c between commit 5bdebb183c97 ("drm/sysfs: sort out minor and connector device object lifetimes") from the drm tree and commit 752aa88a1e78 ("drm/i915: make backlight functions take a connecto

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/drm_crtc.c between commit b21e3afe2357 ("drm: use ida to allocate connector ids") from the drm tree and commit 88cd8b8b1503 ("drm: add MIPI DSI encoder and connector types") from the drm-intel tree. I fixed i

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_fb.c between commit b72447cdf129 ("drm/i915: Drop bogus fbdev sprite disable code") from the drm tree and commit b51b32cde175 ("drm/i915: s/drm_i915_private_t/struct drm_i915_private/") from the drm

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

On Wed, May 1, 2013 at 6:37 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in > drivers/gpu/drm/i915/i915_reg.h between commit a65851af5938 ("drm/i915: > Make data/link N value power of two") from the drm tree and commit > 72419203cab9 ("drm

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_reg.h between commit a65851af5938 ("drm/i915: Make data/link N value power of two") from the drm tree and commit 72419203cab9 ("drm/i915: hw state readout support for fdi m/n") from the drm-intel tre