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

Hi all, On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > error: the following would cause module name conflict: > drivers/video/fbdev/om

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

Hi all, On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell wrote: > > On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell > wrote: > > > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > >

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

~~~ Caused by commit 5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter") interacting with commit 3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate") from Linus' tree (v4.20-rc1) I have added the following merge fi

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

er 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_ttm.c index 663aa7d2e2ea,86259435803e.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/g

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

Hi all, On Thu, 3 Jun 2021 12:48:47 +1000 Stephen Rothwell wrote: > > diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index bcfd4a8d0288,1923f035713a.. > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@@ -657,

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

Hi all, On Thu, 3 Jun 2021 12:48:47 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got conflicts in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > > between commit: > > d3116756a7

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

ecessary. 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

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

me and cleanup dma_resv_get_excl v3") I have used the drm-misc tree from next-20210604 for today. -- Cheers, Stephen Rothwell pgpHTxpsI2967.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

he drm-misc tree interacting with commit b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs") from the drm tree. I don't know how to fix this, so I added the following hack (a better fix would be nice): From: Stephen Rothwell Date: Tue, 8 Jun 2021 12:41:16 +1000 Su

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

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_hdmi.c index 8106b5634fe1,3c4cc133e3df.. --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_

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

'inst' [-Werror=unused-variable] 491 | u32 inst, aper; | ^~~~ cc1: all warnings being treated as errors Caused by commit 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if condition.") I have used the drm-misc tree from next-20211011 for t

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

r fix I have had to apply today. I have applied the following patch for today. From: Stephen Rothwell Date: Fri, 15 Oct 2021 20:17:52 +1100 Subject: [PATCH] drm/locking: fix for name conflict Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")

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

ommit 8a12b170558a ("drm/privacy-screen: Add notifier support (v2)") -- Cheers, Stephen Rothwell pgp0dgtsMSEQy.pgp Description: OpenPGP digital signature

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

2fd48f ("drm/locking: add backtrace for locking contended locks without backoff") -- Cheers, Stephen Rothwell pgp9PiBiGkN85.pgp Description: OpenPGP digital signature

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

Hi Jani, On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula wrote: > > The fix looks good, but I'd rename __stack_depot_print too added in the > same commit. Do you want to respin or shall I take it from here? If you are happy to take it on, then thanks. -- Cheers, St

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

Hi all, On Tue, 5 Oct 2021 10:23:23 +0200 Christian König wrote: > > Am 05.10.21 um 09:59 schrieb Stephen Rothwell: > > > > After merging the drm-misc tree, today's linux-next build (htmldocs) > > produced this warning: > > > > include/linux/dma-buf.h:4

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

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

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/kmb/kmb_drv.c index 961ac6fb5fcf,7e1fda9f9a3d.. --- a/drivers/gpu/drm/kmb/kmb_drv.c +++ b/drivers/gpu/drm/kmb/kmb_drv

[Intel-gfx] linux-next: manual merge of the char-misc tree with the drm-intel 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/gem/i915_gem_dmabuf.c index a45d0ec2c5b6,abb854281347.. --- a/drivers/gpu/drm/i915/ge

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

Hi all, 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: > > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for > '__stack_

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

Hi Stephen, On Tue, 5 Oct 2021 18:59:40 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > include/linux/dma-buf.h:456: warning: Function parameter or member 'cb_i

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

uot;) from the drm-misc tree. The automatic merge proved incorrect, so I have removed one of the insertions. -- Cheers, Stephen Rothwell pgprJS2FOhlIi.pgp Description: OpenPGP digital signature

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

ot;drm/bridge: Add a function to abstract away panels") -- Cheers, Stephen Rothwell pgpENuuMeVPxn.pgp Description: OpenPGP digital signature

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

onflicts 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 pgpXo7gauGnap.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] [PATCH v3 03/13] drm/dp: add LTTPR DP 2.0 DPCD addresses

struct psr_caps { > # define DP_DSC_DECODER_COUNT_MASK (0b111 << 5) > # define DP_DSC_DECODER_COUNT_SHIFT 5 > #define DP_MAIN_LINK_CHANNEL_CODING_SET 0x108 > -#define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER 0xF0006 > -#define DP_PHY_REPEATER_128b_132b_RATES

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

Excess function parameter 'vend_chr_3' description in 'drm_edid_encode_panel_id' Introduced by commit 7d1be0a09fa6 ("drm/edid: Fix EDID quirk compile error on older compilers") -- Cheers, Stephen Rothwell pgpvLFaE1h1O5.pgp Description: OpenPGP digital signature

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

#x27;cb_out' not described in 'dma_buf' Introduced by commit 6b51b02a3a0a ("dma-buf: fix and rework dma_buf_poll v7") -- Cheers, Stephen Rothwell pgpBwhNdS7jU2.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] mmotm 2021-10-05-19-53 uploaded (drivers/gpu/drm/msm/hdmi/hdmi_phy.o)

use CONFIG_DRM_MSM is set but CONFIG_COMMON_CLOCK is not and has been exposed by commit b3ed524f84f5 ("drm/msm: allow compile_test on !ARM") from the drm-misc tree. -- Cheers, Stephen Rothwell pgp49ZVdGmUb5.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm 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/intel_device_info.h index f88be11a3570,ef1eecd259e0.. --- a/drivers/gpu/drm/i915/intel_device_info.h +

[Intel-gfx] linux-next: manual merge of the amdgpu 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/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index f7235438535f,e2cbe19404c0.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vra

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

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

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

commit b347e04452ff ("drm: Remove pdev field from struct drm_device") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpXJh22Xbh4M.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@l

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-

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

y 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_mm.c index 9a777b0ff59b,25576fa73ff0.. --- a/drivers/gpu/drm/i915/i915_mm.c +++ b/drivers

[Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc 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 diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c index a4404da8ca6d,8860545344c7..

[Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc 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/amdgpu/amdgpu_vm.c index 90c34491f85d,57a6ad04118c.. --- a/drivers/g

[Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc 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 diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index a99d196b05df,a52e17ed3df6..

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device.c index b066aa009b6f,80015e866498.. --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/d

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

Hi all, On Thu, 20 May 2021 10:19:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_mm.c > > between commit: > > 293837b9ac8d ("Revert "i915: fix remap_io_sg to ver

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

| ^~~~ drivers/gpu/drm/i915/i915_reg.h:185:47: note: in definition of macro '_MMIO' 185 | #define _MMIO(r) ((const i915_reg_t){ .reg = (r) }) | ^ Caused by commit 0633cdcbaa77 ("drm/i915/d

[Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-intel tree

Hi all, Commit db47fe727e1f ("drm/i915/step: s/_revid_tbl/_revids") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpibXSRKsvDB.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list

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

parser' drivers/gpu/drm/i915/i915_cmd_parser.c:1436: warning: Excess function parameter 'shadow_map' description in 'intel_engine_cmd_parser' drivers/gpu/drm/i915/i915_cmd_parser.c:1436: warning: Excess function parameter 'batch_map' description in 'intel_engine

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

d981f ("drm/i915: Fix the GT fence revocation runtime PM logic") -- Cheers, Stephen Rothwell pgpXX9cvPIdQU.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/m

[Intel-gfx] linux-next: please do not base your tree on v5.12-rc1-dontuse

Hi all, The latest version of the drm-misc tree consists of just 2 commits on top of Linus' v5.12-rc1-dontuse tag. -- Cheers, Stephen Rothwell pgp3hJ0faDbsT.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Inte

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

5: Fix the GT fence revocation runtime PM logic") -- Cheers, Stephen Rothwell pgplptkj5NAGu.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: build warning after merge of the drm-intel-fixes tree

Hi all, On Fri, 26 Mar 2021 19:58:38 +1100 Stephen Rothwell wrote: > > After merging the drm-intel-fixes tree, today's linux-next build > (htmldocs) produced this warning: > > Documentation/gpu/i915:22: /drivers/gpu/drm/i915/intel_runtime_pm.c:423: > WARNING: Inl

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm 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/display/intel_display.c index aa524eff20e1,bdb2adb4d748.. --- a/dri

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes 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/vc4/vc4_plane.c index 1e9c84cf614a,c76e73a452e0.. --- a/drivers/gpu/drm/vc4/vc4_plane.c

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-gfx] linux-next: build warnings after merge of the drm-intel tree

~~~^ %x Introduced by commit 921f3a60e54e ("drm/i915/selftests: Verify we can perform resets from atomic context") -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

eqno); Introduced by commit b312d8ca3a7c ("dma-buf: make fence sequence numbers 64 bit v2") -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

50a3 ("drm/atomic: integrate modeset lock with private objects") interacting with commit eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state") from Linus' tree (merged during the merge window). Its not obvious how to fix this up, so I hav

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

out. I added that resolution for today, thanks. -- Cheers, Stephen Rothwell pgpYygTl1eIdv.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' 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/omapdrm/omap_encoder.c index 933ebc9f9faa,4566e0a75cb8.. --- a/drivers/gpu/drm/omapdrm/omap_encoder.c

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

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. -- Cheers, Stephen Ro

[Intel-gfx] linux-next: Fixes tag needs some work in the drm-misc tree

_can_sleep() to drm_util.h") The SHA1 does not reference a commit currently in the tree. Maybe it was meant to be e9eafcb58921. -- Cheers, Stephen Rothwell pgp7QjOgcd_CR.pgp Description: OpenPGP digital signature ___ Intel-gfx ma

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm 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 pgpvTfRYQe76D.pgp Description:

[Intel-gfx] linux-next: Fixes tag needs some work in the drm-intel-fixes tree

match target commit subject Just some whitespace. -- Cheers, Stephen Rothwell pgpF93oG_jKCQ.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: Fixes tag needs some work in the drm-intel-fixes tree

I missed? Its just that the subject line of that commit has a space after the ':', but the copy of that subject line in the Fixes tag omitted that space. This is not a big issue, my script just pointed it out. Its not worth doing anything about it, just take a bit more care in the futu

[Intel-gfx] linux-next: Fixes tag needs some work in the drm-misc-fixes tree

Hi all, In commit 053ff09f1a8f ("drm/rockchip: rgb: update SPDX license identifier") Fixes tag Fixes: 1f0f01515172 ("Add support for Rockchip Soc RGB output interface") has these problem(s): - Subject does not match target commit subject -- Chee

[Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-intel tree

Hi all, Commit 8e525cb4a622 ("drm/i915/execlists: Move RPCS setup to context pin") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpxcZGqnpdyb.pgp Description: OpenPGP digital signature ___ Intel-gfx ma

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

guments, but only 2 given return IS_GEN(dev_priv, 6) && ^ Caused by commit a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen") It seems this was cherry-picked incorrectly :-( I have reverted that comm

[Intel-gfx] linux-next: Fixes tag needs some work in the drm-intel tree

- Subject has leading but no trailing quotes Please don't split Fixes tags across more than one line. -- Cheers, Stephen Rothwell pgpBEqVa_2TQ6.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.f

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

bmitted 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/amdgpu/amdgpu_device.c index c9024f92e203,b9371ec5e04f.. --- a/d

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

the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell From: Stephen Rothwell Date: Tue, 21 May 2019 10:48:36 +1000 Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion Signed-off-by: Stephen Rothwell --- Documentation/devicetree/bindin

Re: [Intel-gfx] Comments in Fixes: line (Was: Re: linux-next: Fixes tag needs some work in the drm-intel tree)

Hi Joonas, On Tue, 21 May 2019 16:04:16 +0300 Joonas Lahtinen wrote: > > We also have an incoming patch where the Fixes: line has a comment in > it. Does your tooling account for this when checking the Fixes: line? I will make sure mine does. -- Cheers, Stephen Rothwell pgpcXXON

[Intel-gfx] linux-next: manual merge of the drm-misc 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/drm_atomic_uapi.c index 4131e669785a,125605ff45af.. --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/

[Intel-gfx] linux-next: manual merge of the drm-misc 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 include/drm/drm_mode_config.h index 5764ee3c7453,c031b5a9d8d1.. --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_con

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

Hi Sean, On Tue, 21 May 2019 10:51:51 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 8122de54602e ("dt-bindings: Conv

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

Hi Maxime, On Thu, 23 May 2019 10:10:22 +0200 Maxime Ripard wrote: > > Hi Stephen, > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > >

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

Hi Maxime, On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard wrote: > > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > Documentation/devicetree/bindings/

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

the file no longer needed deleting. I didn't actually check to see if it was still there. -- Cheers, Stephen Rothwell pgpE2fgES6Jja.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedes

Re: [Intel-gfx] 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 wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/mmio_context.c > > between commi

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

^ Caused by commit a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs") interacting with commit a3e4d3f97ec8 ("XArray: Redesign xa_alloc API") from Linus' tree (v5.1-rc1). I have applied the following patch for today. It could be

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

Add ASPEED GFX driver") I have disabled that driver for today (by making it depend on BROKEN). -- Cheers, Stephen Rothwell pgpnTv6L4d7ao.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freede

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

Hi Dave, On Fri, 5 Apr 2019 15:55:50 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such > file o

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

ing tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpGlVVZGS8SQ.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

ted 'void *' but argument is of type 'int' void drm_fb_xrgb_to_rgb888_dstclip(void *dst, unsigned int dst_pitch, ~~^~~ Caused by commit ab3e023b1b4c ("drm/cirrus: rewrite and modernize driver.") I have marked that driver BROKEN for today.

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

Hi Gerd, On Tue, 9 Apr 2019 09:22:18 +0200 Gerd Hoffmann wrote: > > On Tue, Apr 09, 2019 at 04:08:49PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > After merging the drm-misc tree, today's linux-next build (powerpc > > allyesconfig) failed like th

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

argument must be a pointer to be dererenced later. The same thing is done in drivers/gpu/drm/i915/i915_gem.c as well. I have applied the following hack patch for now, but this needs to be fixed properly. From: Stephen Rothwell Date: Tue, 5 Jul 2016 13:44:39 +1000 Subject: [PATCH] drm/i915: hack aroun

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the arm 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 7fd20c0e1fc8,f0bd1ee

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

("drm/i915: Ignore panel type from OpRegion on SKL") from the drm-intel-fixes tree. I applied this merge fix patch: From: Stephen Rothwell Date: Fri, 15 Jul 2016 13:34:05 +1000 Subject: [PATCH] drm/i915/opregion: fix up for argument change Signed-off-by: Stephen Rothwell --- drivers/gp

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm 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/i915_pci.c index 5d05572c9ff4,36fa6f1905fc.. --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i

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

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

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

tialized in this function [-Wmaybe-uninitialized] return ret; ^~~ Introduced by commit bb3b6fcb6849 ("sun6i: dsi: Convert to generic phy handling") -- Cheers, Stephen Rothwell pgpx95dx9pPSG.pgp Description: OpenPGP digital signature _

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

by commit e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h") I have used the drm-misc tree from next-20190207 for today. -- Cheers, Stephen Rothwell pgpcycNlzV0FC.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-misc tree with the drm tree

Hi Daniel, On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter wrote: > > There isn't a "below" afaics Oops :-( However the merge diff is not very enlightening in this case anyway. It makes more sense to look at the final result when I finish up in a while. -- Che

Re: [Intel-gfx] linux-next: Tree for Nov 29 (drm/i915)

5/intel_runtime_pm.o: in function > `intel_opregion_resume': > intel_runtime_pm.c:(.text+0x2cb0): multiple definition of > `intel_opregion_resume'; > drivers/gpu/drm/i915/i915_drv.o:i915_drv.c:(.text+0x2d40): first defined here > ld: drivers/gpu/drm/i915/intel_runtime_p

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

~~~ Caused by commit 0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"") interacting with commit 1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU") I have used the drm-misc tree from next-20181205 for today. -- C

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel 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/intel_hdmi.c index ecfec5d3292e,765718b606d8.. --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/

[Intel-gfx] linux-next: manual merge of the drm-intel 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 diff --cc drivers/gpu/drm/i915/gvt/mmio_context.c index 7902fb162d09,a00a807a1d55..00

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

Caused by commit 6cc5ca768825 ("drm/i915: rename raw reg access functions") I have reverted that commit and the following ones in the tree up to 9511cb6481af ("drm/i915: Adding missing '; ' to ENGINE_INSTANCES") -- Cheers, Stephen Rothwell pgphbS

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

Hi Joonas, On Wed, 27 Mar 2019 13:07:40 +0200 Joonas Lahtinen wrote: > > Quoting Stephen Rothwell (2019-03-27 04:59:04) > > > > After merging the drm-intel tree, today's linux-next build (i386 > > defconfig) failed like this: > > We had a CI reporting

[Intel-gfx] linux-next: unable to fetch the drm-intel-fixes tree

. - The same for drm-misc-fixes, drm-intel and drm-misc. These are all hosted on git://anongit.freedesktop.org/ . -- Cheers, Stephen Rothwell pgpurRd_qWJTU.pgp Description: OpenPGP digital signature ___ Intel-gfx

Re: [Intel-gfx] linux-next: unable to fetch the drm-intel-fixes tree

Hi Stephen, On Mon, 3 Jun 2019 08:20:51 +1000 Stephen Rothwell wrote: > > Hi all, > > Trying to fetch the drm-intel-fixes tree today gives me this error: > > - > fatal: Could not read from remote repository.

Re: [Intel-gfx] linux-next: unable to fetch the drm-intel-fixes tree

o worries, I will just keep using what I have previously fetched. -- Cheers, Stephen Rothwell pgpiFHnhhCRAa.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: unable to fetch the drm-intel-fixes tree

Hi Daniel, On Mon, 3 Jun 2019 19:50:18 +1000 Stephen Rothwell wrote: > > On Mon, 3 Jun 2019 09:31:03 +0200 Daniel Vetter wrote: > > > > drm.git too I guess? > > No, I fetch that from git://git.freedesktop.org/ which seems to answer. > > > But yeah fd.o

[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/amd/amdgpu/amdgpu_ttm.c index 7138dc1dd1f4,a8a1fcab299b.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tt

[Intel-gfx] linux-next: manual merge of the drm-misc 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. I am not sure if this is actually needed but it seemed prudent with the addition of the kzalloc/kfree calls in this file. From: St

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the amdgpu 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/amd/display/dc/dce/dce_audio.c index d43d5d924c19,9b078a71de2e.. --- a/drivers/gpu/drm/amd/display/dc/dce/dce_

  1   2   3   4   5   6   7   8   >