[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

ut metadata for supported connectors") from the drm tree. I added the following merge fix patch: From: Stephen Rothwell Date: Fri, 14 Jun 2019 14:27:12 +1000 Subject: [PATCH] fixup for "drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state" Sign

Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree

*** [drivers/gpu/drm] Error 2 > scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed > make[1]: *** [drivers/gpu] Error 2 > Makefile:1071: recipe for target 'drivers' failed > make: *** [drivers] Error 2 > Can someone please

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

ivial 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. -- Cheers, Stephen Rothwell pgpHAUmmzpDSr.pgp Description:

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

Hi all, On Wed, 12 Jun 2019 11:46:15 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/dc/dce/dce_audio.c > > between commit: > > c7c7192c56d2 ("

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

Hi all, On Mon, 17 Jun 2019 13:20:27 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.h > > between commit: > > 151f4e2bdc7a ("docs: power: convert docs to ReST and r

Re: [Intel-gfx] mmotm 2019-07-04-15-01 uploaded (gpu/drm/i915/oa/)

t? Commit 5ed7a0cf3394 ("drm/i915: Move OA files to separate folder") from the drm-intel tree seems to have created it as an empty file. -- Cheers, Stephen Rothwell pgp2PWxDEJlhM.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Hi all, On Mon, 24 Jun 2019 13:53:52 +1000 Stephen Rothwell wrote: > > On Mon, 17 Jun 2019 13:20:27 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i

Re: [Intel-gfx] linux-next: Tree for Jun 15 (drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c)

Alex Deucher wrote: > > > > On Wed, Jun 15, 2022 at 3:01 PM Randy Dunlap > > > > wrote: > > > > > > > > > > > > > > > > > > > > On 6/14/22 23:01, Stephen Rothwell wrote: > > > > > >

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

mits that dropped includes from drm-ctrc.h. I have used the drm-misc tree from next-20220620 for today. -- Cheers, Stephen Rothwell pgpONB8A38WPS.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, On Tue, 21 Jun 2022 10:48:17 +0300 Ville Syrjälä wrote: > > On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > &g

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/vc4/vc4_drv.c index 0f0f0263e744,14a7d529144d.. --- a/drivers/gpu/drm/vc4/vc4_d

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

c ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new") from the drm tree. This is a mess :-( I have just reverted the above revert before mergin the drm tree for today, please fix it up. -- Cheers, Stephen Rothwell pgpc8y60in8al.pgp Description: OpenPGP digital signature

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

en 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. -- Cheers, Stephen Rothwell pgpm9wv_3iwrC.pgp Description: OpenPGP digital signature

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

hen 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. -- Cheers, Stephen Rothwell pgpkByDo038dK.pgp Description: OpenPGP digital signature

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

Hi all, On Fri, 18 Mar 2022 11:55:44 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/bridge/Kconfig > > between commit: > > 3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependen

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi Andrey, On Tue, 1 Mar 2022 22:26:12 -0500 Andrey Grodzovsky wrote: > > On 2022-03-01 20:31, Stephen Rothwell wrote: > > Hi all, > > > > On Thu, 20 Jan 2022 14:26:39 +1100 Stephen Rothwell > > wrote: > >> On Wed, 17 Nov 2021 13:49:26 +1100 Steph

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

intainer 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_pci.c index c32c0c6661c8,8e321d300e0c..00

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

You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_device_info.h index 291215d9da28,8026e805ff12.. --- a/drivers/gpu/drm/i915/intel_device_inf

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

ntainer 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. From: Stephen Rothwell Date: Tue, 17 May 2022 11:19:42 +1000 Subject: [PATCH] fi up for "drm/i915/dmc: Add MM

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

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. -- Cheers, Stephen Rothwell pgp73lee5kJYq.pgp Description: OpenPGP digital signature

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

for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gt/intel_rps.c index 3476a11f294c,ce61ceb07114.. --- a/drivers/gpu/drm/i915/gt/intel_

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

ntioned 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. -- Cheers, Stephen Rothwell diff --cc include/uapi/linux/dma-buf.h index b1523cb8ab30,

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

e reverted that commit for today. -- Cheers, Stephen Rothwell pgp78zogS7qSZ.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

h:378: WARNING: Block quote ends without a blank line; unexpected unindent. Introduced by commit 69ef4a192bba ("drm: Document the power requirements for DP AUX transfers") -- Cheers, Stephen Rothwell pgpzrtpOFUQ7E.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

aused by commit aff1e0b09b54 ("drm/i915/ttm: fix sg_table construction") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpSnJ_MEUDdd.pgp Description: OpenPGP digital signature

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

Hi all, On Mon, 11 Jul 2022 10:05:45 +0200 Christian König wrote: > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell: > > > > Today's linux-next merge of the drm tree got a conflict in: > > > >drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c > > &g

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

Hi all, On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell wrote: > > On Mon, 11 Jul 2022 10:05:45 +0200 Christian König > wrote: > > > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell: > > > > > > Today's linux-next merge of the drm tree got a

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

Hi Dave, On Wed, 27 Jul 2022 13:24:45 +1000 Dave Airlie wrote: > > My assumption is I fix this on sending my -next tree to Linus with a > resolution I create at that time? > > Is there another option, we have this fixed in out drm-tip tree already. Sounds good, no problem. --

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

en 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. From: Stephen Rothwell Date: Wed, 6 Apr 2022 10:28:53 +1000 Subject: [PATCH] fix up for "drm/ttm: rework bulk mo

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

rm/panel: Add panel driver for NewVision NV3052C based LCDs") interacting with commit 2cbfa2128662 ("spi: make remove callback a void function") from Linus' tree (merged in v5.18-rc1). I applied the following merge resolution patch for today. From: Stephen Rothwell Date: We

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

used outside an init section. Introduced by commit 8dde6f7452a1 ("drm: bridge: icn6211: Add I2C configuration support") The chipone_exit function should not be marked __init. -- Cheers, Stephen Rothwell pgpu5shRTGYoB.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

nction parameter 'raw_edid' description in 'drm_edid_block_valid' Introduced by commits 6d987ddd6843 ("drm/edid: make drm_edid_header_is_valid() accept void pointer") 1f221284ab63 ("drm/edid: split drm_edid_block_valid() to check and act parts") -- Cheers, Stephen Rothwell pgpKN1XuSh1K6.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

/ttm: allow bulk moves for all domains") -- Cheers, Stephen Rothwell pgpdP1w73EKub.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

Hi all, On Wed, 6 Apr 2022 15:44:31 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (KCONFIG_NAME) This was an "htmldocs" build. -- Cheers, Stephen Rothwell pgp21BZgJxF3c.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

rrors Caused by commit 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4") I have used the drm-misc tree from next-20220407 for today. -- Cheers, Stephen Rothwell pgpFnCCmHSzOz.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, On Wed, 6 Apr 2022 15:50:30 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > include/drm/ttm/ttm_resource.h:226: warning: Function parameter or member > 'pos' no

Re: [Intel-gfx] linux-next: build warnings after merge of the drm-misc tree

Hi all, On Wed, 6 Apr 2022 15:44:31 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (KCONFIG_NAME) htmldocs > produced these warnings: > > drivers/gpu

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

Hi all, On Wed, 6 Apr 2022 10:34:05 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > > between commit: > > fee2ede15542 ("drm/ttm: rework bulk move handling v5

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

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpQ7s1f_LhQw.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

er 'data' description in 'drm_do_get_edid' Introduced by commit 89fb7536ad2f ("drm/edid: add typedef for block read function") -- Cheers, Stephen Rothwell pgpqcHK6wjGpC.pgp Description: OpenPGP digital signature

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

Hi all, On Thu, 14 Apr 2022 09:47:15 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/radeon/radeon_sync.c > > between commit: > > 022074918042 ("drm/radeon: fix logic inversion in ra

[Intel-gfx] linux-next: build failure after merge of the drm-intel tree

vmgt.ko") or one of tehe follow ups. I have used the drm-intel tree from next-20220422 for today. -- Cheers, Stephen Rothwell pgpQWBMcQ4M2j.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 13 Apr 2022 10:10:14 +1000 Stephen Rothwell wrote: > > On Wed, 6 Apr 2022 10:34:05 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the amdgpu tree got a conflict in: > > > > drivers/gpu/drm/amd/amdg

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

Hi all, On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > > between commit: > > 5740211ea442 ("drm/i915/dmabuf: fix broken bu

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell wrote: > > On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > >

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi Jani, On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote: > > I probably should have pushed c4f08d7246a5 ("drm/locking: fix > __stack_depot_* name conflict") to drm-misc-next-fixes. Please do so as builds will start failing otherwise :-( -- Cheers, Stephen Rothwell

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

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index a573424a6e0b,a1e63ba4c54a.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/d

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

Hi all, On Fri, 5 Nov 2021 12:51:22 +1100 Stephen Rothwell wrote: > > On Thu, 28 Oct 2021 18:27:53 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > > > drivers/gpu/drm/i915/gem/i91

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

ur 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c index 8e28403ea9b1,23fa

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

oid lockdep spalt on killing a processes") -- Cheers, Stephen Rothwell pgpU5k9oX6Gpk.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-gt tree

Hi Joonas, On Wed, 17 Nov 2021 12:35:50 +0200 Joonas Lahtinen wrote: > > + intel-gfx mailing list (Stephen, can you include this going forward?) I have added that to my contacts for this tree (so, yes :-)). -- Cheers, Stephen Rothwell pgpu3TAyT8ZHT.pgp Description: OpenPGP d

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

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_pci.c index 69b8029da6b6,5e6795853dc3.. --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i9

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

intainer 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/vc4/vc4_kms.c index b61792d2aa65,79d4d9dd1394..

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

g core_rate = max_t(unsigned long, > + 5, > + new_hvs_state->core_clock_rate); > + > + clk_set_min_rate(hvs->core_clk, core_rate); > + } > > drm_atomic_helper_commit_modeset_disables(dev, state); > -- >8 -- Thanks, I have fixed that up in my resolution. -- Cheers, Stephen Rothwell pgp0t_CrocJv_.pgp Description: OpenPGP digital signature

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/display/intel_fbc.c index d0c34bc3af6c,c40444206425.. --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/dri

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, On Thu, 20 Jan 2022 14:26:39 +1100 Stephen Rothwell wrote: > > On Wed, 17 Nov 2021 13:49:26 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (htmldocs) > > produced this warning: > > > &

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

had build problems for some time and so has not been included completely until today. Thanks. -- Cheers, Stephen Rothwell pgputgc_q_ZeX.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, On Fri, 15 Oct 2021 20:54:22 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > Documentation/gpu/drm-kms-helpers:451: > /home/sfr/next/next/drivers/gpu/drm/drm_privacy_screen

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, On Fri, 15 Oct 2021 21:01:04 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > include/drm/drm_modeset_lock.h:74: warning: Function parameter or member > 's

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, On Wed, 17 Nov 2021 13:49:26 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > include/drm/gpu_scheduler.h:316: warning: Function parameter or member 'work' >

Re: [Intel-gfx] [PATCH] drm/locking: fix drm_modeset_acquire_ctx kernel-doc

in 'drm_modeset_acquire_ctx' > > Reported-by: Stephen Rothwell > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks > without backoff") > Signed-off-by: Jani Nikula > --- > include/drm/drm_modeset_lock.h | 1 + > 1 file ch

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

hen 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_reg.h index 971d601fe751,cf168c3e0471.. --- a/d

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

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. -- Cheers, Stephen Rothwell pgpnCh0SfU4dT.pgp Description: OpenPGP digital signature

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

ts 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. From: Stephen Rothwell Date: Tue, 25 Jan 2022 09:44:44 +1100 Subject: [

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

did you mean 'net'? 451 | ret = i915_gem_object_wait_moving_fence(vma->obj, true); | ^~~ | net Caused by commit 2e872d87cbf2 ("drm/i915: delete shadow "ret" variable") I

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

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. -- Cheers, Stephen Rothwell pgpuwArqosfza.pgp Description: OpenPGP digital signature

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

ches due to the splitting up of i915_reg.h. From: Stephen Rothwell Date: Thu, 3 Feb 2022 11:09:02 +1100 Subject: [PATCH] fix up for "drm/i915: Move GT registers to their own header file" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + 1 file ch

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

our 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. -- Cheers, Stephen Rothwell pgp5Wl5oLwI4T.pgp Description: OpenPGP digital signature

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

ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_module.c index 8451822637f0,5d6fdf37fb5a.. --- a/drivers/gpu/drm/i915/i915_module.c +

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

Hi all, The ongoing merge conflicts between the drm-intel tree and the drm-intel-gt tree are just a mess, so I am removing the drm-intel-gt tree from linux-next until you all can come up with a better way of doing conflicting development. -- Cheers, Stephen Rothwell pgpSYb7OTQzQr.pgp

[Intel-gfx] linux-next: build failure after merge of the drm-intel tree

am beginning to wonder if you guys run stuff through your CI before relasing to linux-next. Especially important when removing #include statements from include files :-) I have used the drm-intel tree from next-20220214 for today. -- Cheers, Stephen Rothwell pgpEN1JYDctRF.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build failure after merge of the drm-intel tree

Caused by commit c7d3c8447b26 ("drm/i915: combine device info printing into one") interacting with commit 368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information") from the drm tree. I have applied the following merge fix patch for today

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

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpajBI4wTZBT.pgp Description: OpenPGP digital signature

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

ntainer 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. From: Stephen Rothwell Date: Tue, 13 Sep 2022 12:06:57 +1000 Subject: [PATCH] drm/i915: fix up for "drm/i915

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

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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 3af2b429ff1b,5ec14efd4d8c..

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

support") form the v4l-dvb tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Tue, 8 Oct 2019 10:26:05 +1100 Subject: [PATCH] cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()" Signed-off-by: Stephen Rothwell --- drivers

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > Sorry, forgot to include the error messages. But they shuld be clear from the fix .

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e8ddc2320efa,493f07806b08.. --- a/drivers/gpu/drm/i915/gem/i9

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

ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.c index 15abad5c2d62,1c4ff8b5b0a2.. --- a/drivers/gpu/drm/i915/i915_drv.c +

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

ncerned, 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. -- Cheers, Stephen Rothwell pgpf9BkA

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

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpypUmYzCaSU.pgp Description: OpenPGP digital signature ___ Intel-gfx mailin

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

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpJYR7ZsK6j4.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@li

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

gainst device cgroup") from the amdgpu tree. I added the following merge fix patch for today: From: Stephen Rothwell Date: Wed, 9 Oct 2019 11:24:38 +1100 Subject: [PATCH] drm/amdkfd: update for drmP.h removal Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6

[Intel-gfx] linux-next: build failure after merge of the drm tree

icked back into your -fixes trees. This practise also causes quite a few unnecessary conflicts that each have to be checked and merged by hand. -- Cheers, Stephen Rothwell pgp68lwBWwGza.pgp Description: OpenPGP digital signature ___

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

#x27;dev' [-Wunused-variable] 4187 | struct drm_device *dev = mgr->dev; | ^~~ Introduced by commit 83fa9842afe7 ("drm/dp-mst: Drop connection_mutex check") -- Cheers, Stephen Rothwell pgpL1PCBPVIc6.pgp

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, This is now a semantic conflict between the drm and v4l-dvb trees. On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: drivers/media/platform/cec-gpio/cec-gpio.

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

Hi all, This is now a conflict between the amdgpu tree and the drm tree. On Fri, 4 Oct 2019 11:10:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c &g

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

("drm: delete drmP.h + drm_os_linux.h") interacting with commit 8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)") from the amdgpu tree. I applied the following merge fix patch for today (which should also apply to the amdgpu tree). From: Stephen Rothwell

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

Hi all, This is now a conflict between the drm tree and Linus' tree. On Thu, 31 Oct 2019 11:33:15 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.h > > between commit: > >

[Intel-gfx] linux-next: build warning after merge of the drm-misc-fixes tree

^ fs/aio.c:2231:38: note: in expansion of macro 'NULL' 2231 | struct __compat_aio_sigset ksig = { NULL, }; | ^~~~ Introduced by commit de80166a573d ("aio: Fix io_pgetevents() struct __compat_aio_sigset layout") -- Cheers, Stephen Rothwell pg

Re: [Intel-gfx] linux-next: build warning after merge of the drm-misc-fixes tree

Hi all, This should have been reported against the vfs-fixes tree, sorry. On Tue, 22 Oct 2019 08:07:34 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the drm-misc-fixes tree, today's linux-next build (powerpc > ppc64_defconfig) produced this warning: >

[Intel-gfx] linux-next: build warning after merge of the vfs-fixes tree

Hi all, [Some people didn't get this due to a typo] This should have been reported against the vfs-fixes tree, sorry. On Tue, 22 Oct 2019 08:07:34 +1100 Stephen Rothwell wrote: > > After merging the drm-misc-fixes tree, today's linux-next build (powerpc > ppc64_defco

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

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.h index 953e1d12c23c,8882c0908c3b.. --- a/drivers/gpu/drm/i915/i915_dr

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

with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gt/intel_ring_submission.c index 93026217c121,81f872f9ef03.. --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c +++ b/drivers/gpu/drm/i91

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

our 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. -- Cheers, Stephen Rothwell pgpITkf845QVF.pgp Description: OpenPGP digital signature _

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

s 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. From: Stephen R

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

Hi all, On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell wrote: > > -hw_flags = 0; > +/* For resource streamer on HSW+ and power context elsewhere */ > +BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN); > +

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

ream 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. From: Stephen Rothwell Date: Wed, 8 Jan 2020 17:04:59 +1100 Subject: [PATCH] fix up for "drm/i915/gtt:

[Intel-gfx] linux-next: manual merge of the generic-ioremap tree with the drm-misc tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/video/fbdev/s1d13xxxfb.c index c23defa27036,8048499e398d.. --- a/drivers/video/fbdev/s1d13xxxfb.c +++ b/drivers

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

Hi all, After merging the drm-intel-fixes tree, today's linux-next build (x86_64 allmodconfig) failed like this: Caused by commit d8fcca47e195 ("drm/i915/userptr: fix size calculation") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpN5QHxyhuHR.

<    1   2   3   4   5   6   7   8   >