[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. From: Stephen Rothwell Date: Wed, 22 Jan 2020 11:33:32 +1100 Subject: [PATCH] fix up for "drm/i915/userptr: fix size calcul

Re: [Intel-gfx] linux-next: Tree for Jan 23 (gpu/drm/panel/)

ee so I can't check that commit. That commit was *not* in next-20200123. It was in next-20200113 to next-20200122 in the drm-misc tree. -- Cheers, Stephen Rothwell pgpiX6bA7Eg8P.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-intel tree

ruct lockdep_map *lock, unsigned long ip); | ^~~~ Caused by commit e692b4021a2e ("lockdep: add might_lock_nested()") interacting with commit 5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()") from Linus' tree.

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

Hi all, [Just adding Dave Airlie to the cc list] On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell wrote: > > After merging the drm-intel tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from include/linux

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

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

[Intel-gfx] linux-next: manual merge of the drm-misc 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 include/drm/drm_dp_mst_helper.h index d5fc90b30487,a448d701dc7e.. --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/d

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

pport") interacting with commit 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API") From Linus' tree. I have applied the following fix up patch for today: From: Stephen Rothwell Date: Mon, 16 Dec 2019 12:11:19 +1100 Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy() Sign

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

Hi Daniel, On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter wrote: > > On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > >

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

t;") are missing a Signed-off-by from their author and committer. Reverts are commits too and should have reasonable commit messages. -- Cheers, Stephen Rothwell pgpOBC6mtowiy.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list I

[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/vgpu.c index 345c2aa3b491,abcde8ce1a9a.. --- a/driver

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

Hi all, On Wed, 11 Mar 2020 13:36:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/gvt/vgpu.c > > between commit: > > 04d6067f1f19 ("drm/i915/gvt: Fix unnecessary sc

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' 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. -- Che

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel 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 pgp3sWvkrCG8F.pgp Description: OpenPGP digital signature ___ Intel-g

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

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 MAINTAINERS index a7f3c96eb61e,ccd0ccfce4eb.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -50

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

or: incompatible types when assigning to type 'pgprot_t' {aka 'struct '} from type 'int' Presumably exposed by commit a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") I just turned off COMPILE_TEST again for today. Please let me know

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

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 pgpdNJipenXtq.pgp Description:

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

Hi all, On Tue, 21 Apr 2020 09:10:25 +0300 Tomi Valkeinen wrote: > > On 21/04/2020 04:52, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc > > tree with the drm-misc-fixes tree > > > >

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

Hi all, On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap': > drivers/vide

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

ith the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/dma-buf.h index 57bcef6f988a,82e0a4a64601.. --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@@ -333,8 -334,16 +333,16 @@@ struct

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

arly complex conflicts. -- Cheers, Stephen Rothwell pgp_BVOmZhMT7.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 kspp-gustavo tree

Hi all, On Tue, 23 Jul 2019 11:03:31 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_dp.c > > between commit: > > b6ac32eac063 ("drm/i915: Mark expected switch f

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

ymlink in connector sysfs directory") I have used the drm-misc tree from next-20190731 for today. -- Cheers, Stephen Rothwell pgpmYX829_tMF.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org h

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/ttm/ttm_bo.c index 2070e8a57ed8,10a861a1690c.. --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@@ -671,10

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

sed by commit 5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv") interacting with commit ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release") from the amdgpu tree. I have added the following patch for today: From: Stephen Rothwell Date: Wed,

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

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, 14 Aug 2019 12:48:39 +1000 Subject: [PATCH] drm: fix up fallout from "dma-buf: rename

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

ner 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/etnaviv/etnaviv_gem_submit.c index 998c96b40d8a,f535a627f297..000

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

oppoly TD028TTEC1 panel") dc2e1e5b2799 ("drm/panel: Add driver for the Toppoly TD043MTEA1 panel") -- Cheers, Stephen Rothwell pgpnl74XI_fNm.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.o

[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/vmwgfx/vmwgfx_resource.c index 2eb3532e3291,0b5472450633.. --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resourc

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

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

rging. 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/panfrost/panfrost_mmu.c index 842bdd7cf6be,6e8145c36e93.. --- a/drivers/gpu/drm/panfrost/

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

Hi all, On Wed, 14 Aug 2019 12:54:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > drivers/gpu/drm/i915/i915_vma.c > drivers/gpu/drm/i915/i915_gem_batch_pool.c &

[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_vma.c index 2645f4e850c2,252edef6c59e.. --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i9

[Intel-gfx] Merge in the drm-intel tree

uot;) but has come back due to a conflict with commit 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm tree. -- Cheers, Stephen Rothwell pgpJ4APEuj6wf.pgp Description: OpenPGP digital signature ___ Intel-gfx ma

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes 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/arm/display/komeda/komeda_dev.c index 9d4d5075cc64,1ff7f4b2c620.. --- a/drivers/gpu/drm/arm/display/komeda/komed

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

rer_workaround, int, 0400); ^~~~ ) Caused by commit 3e93bc2a58aa ("drm/virtio: make resource id workaround runtime switchable.") I applied the following fix patch: From: Stephen Rot

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

Hi all, On Wed, 8 Jan 2020 17:08:03 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the generic-ioremap tree got a conflict in: > > drivers/gpu/drm/i915/i915_gem_gtt.c > > between commit: > > 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_

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

-Werror=implicit-function-declaration] 202 | if (mem_encrypt_active()) | ^~ Caused by commit 3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c") I have used the drm-misc tree from next-20210107 again for today. -- Cheers, Stephen Rothw

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

17a30aa ("drm/amdgpu: Resize BAR0 to the maximum available size, even if it doesn't cover VRAM") -- Cheers, Stephen Rothwell pgpzTTzZvqwKN.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 failure after merge of the drm tree

Hi all, On Mon, 11 Jan 2021 10:56:54 +1100 Stephen Rothwell wrote: > > 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,

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

2087 | drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk) | ^~~~ Caused by commit 7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"") Since the drm-intel tree still has its other build failure, I used the version

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

; patch already), so hopefully we should be all clean again. Thanks. -- Cheers, Stephen Rothwell pgpnUv51MUYI_.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 failure after merge of the drm-intel tree

Hi all, On Wed, 20 Jan 2021 10:57:15 +1100 Stephen Rothwell wrote: > > After merging the drm-intel tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/msm/dp/dp_ctrl.c: In function 'dp_ctrl_use_fixed_nvid': > drivers

[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/ttm/ttm_pool.c index 11e0313db0ea,e0617717113f

[Intel-gfx] linux-next: manual merge of the drm-intel 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 diff --cc drivers/gpu/drm/i915/gem/i915_gem_object.h index 5274e9d139b4,ae83737f1d48.. --- a

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

error=incompatible-pointer-types] 390 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job') Caused by commit a6a1f0

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

Hi all, Commit 44c5bd08518c ("*** HAX FOR CI *** Revert "rtc: mc146818: Detect and handle broken RTCs"") is missing a Signed-off-by from its author and committer. Reverts are commits as well. -- Cheers, Stephen Rothwell pgpKZp048c5Hl.pgp Description: OpenP

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

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

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

) but that just produced more errors, so I have disabled CONFIG_DRM_MSM for now. -- Cheers, Stephen Rothwell pgpKF9QObojh9.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 warning after merge of the drm-misc tree

ZE); | ^~~ Introduced by commit 222ec45f4c69 ("drm/fb_helper: Support framebuffers in I/O memory") -- Cheers, Stephen Rothwell pgpJKA47i4E4Z.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 failure after merge of the drm-misc tree

Hi Michael, On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin" wrote: > > On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote: > > > > After merging the drm-misc tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this:

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

ommit 39aead8373b3 ("fbcon: Disable accelerated scrolling") -- Cheers, Stephen Rothwell pgpNXxBdbR5BU.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 tree

ed the following merge fix patch for today: From: Stephen Rothwell Date: Wed, 9 Dec 2020 12:47:45 +1100 Subject: [PATCH] fixup for "drm/i915/gt: Declare gen9 has 64 mocs entries!" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- 1 file changed, 1 insertion(

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

rm/scheduler: "node" --> "list"") -- Cheers, Stephen Rothwell pgp07u_IQDjx4.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] [PATCH] drm/sched: Add missing structure comment

Hi Luben, On Wed, 9 Dec 2020 16:58:07 -0500 Luben Tuikov wrote: > > Add a missing structure comment for the recently > added @list member. > > Signed-off-by: Luben Tuikov > > Cc: Stephen Rothwell > Cc: Daniel Vetter > Cc: Christian König The commit message tag

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

duler: provide scheduler score externally") -- Cheers, Stephen Rothwell pgpuqtj8Rn2oX.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

error=incompatible-pointer-types] 390 | .timedout_job = v3d_generic_job_timedout, | ^~~~ drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job') Caused by commit c10983

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

Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c >

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

o, if you don't want to see these warnings in Linus' build testing, you need to make sure that the drm-misc tree is merged before the pm tree (or the drivers-x86 tree). Or you need to include module.h in mdfld_output.c before intel_scu_ipc.h (or in intel_scu_ipc.h itself). -- Cheers, St

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

Hi all, On Mon, 15 Feb 2021 11:39:39 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the pm tree, today's linux-next build (x86_64 allmodconfig) > produced this warning: > > In file included from drivers/gpu/drm/gma500/mdfld_output.c:28: > arch/x86/i

[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: Wed, 17 Mar 2021 14:05:42 +1100 Subject: [PATCH] merge fix for "drm: Switch to %p4cc f

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

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 pgpVu5Im69xoX.pgp Description:

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

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

Hi all, On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the extcon tree got a conflict in: > > MAINTAINERS > > between commit: > > f61249dddecc ("MAINTAINERS: Add entry for i.MX 8MQ DCSS driver")

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

arked it BROKEN again. -- Cheers, Stephen Rothwell pgpzU0SuNYvli.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 failure after merge of the drm-misc tree

Hi all, On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: In file included from include/linux/clk.h:13, from drivers/gpu/drm/ingenic/ingenic-drm-drv

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

Hi all, On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell wrote: > > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > In fil

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

Hi all, [Just adding Dave to cc's] On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell wrote: > > Hi all, > > On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell > wrote: > > > > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell > > wrote: >

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

o want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_dp_helper.h index da53aebb7230,ae4e20245ba3.. --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp

[Intel-gfx] linux-next: manual merge of the drm-misc 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 diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index f56414a06ec4,5ba9b49dfa7a.. --- a/drivers/gpu/drm/msm/disp/dpu

[Intel-gfx] linux-next: manual merge of the drm-misc 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 diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c index 07945ca238e2,c1824f536936.. --- a/drivers/gpu/drm/virtio/virt

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the amdgpu 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, 28 Oct 2020 11:52:31 +1100 Subject: [PATCH] merge fix up for "drm

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

Hi all, Commit d13208a88f41 ("lockdep: Fix nr_unused_locks") is missing a Signed-off-by from its author. Also, the author's email name is missing the leading 'P'. -- Cheers, Stephen Rothwell pgp0c7gXTexDy.pgp Description:

[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 diff --cc drivers/gpu/drm/drm_gem.c index 69c2c079d803,1da67d34e55d.. --- a/drivers/gpu/drm/drm_gem.c +++ b/

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

tlb_nr_tbl' [-Werror=implicit-function-declaration] 320 | need_swiotlb = !!swiotlb_nr_tbl(); | ^~ Caused by commit ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2") I have used the drm-misc tree from next-20201029 for t

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

("drm/nouveu: fix swiotlb include") I applied the following fix for today: From: Stephen Rothwell Date: Mon, 2 Nov 2020 12:34:57 +1100 Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()") Sig

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

[-Wunused-variable] 617 | struct panfrost_job_slot *js = pfdev->js; |^~ Introduced by commit a17d609e3e21 ("drm/panfrost: Don't corrupt the queue mutex on open/close") -- Cheers, Stephen Rothwell pgpbjMcG7DexY

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

] 322 | struct vc4_dev *vc4 = to_vc4_dev(drm); | ^~~ Introduced by commit dcda7c28bff2 ("drm/vc4: kms: Add functions to create the state objects") -- Cheers, Stephen Rothwell pgpbHJN1DgVg5.pgp Description: OpenPGP digital signature __

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the amdgpu 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/display/amdgpu_dm/amdgpu_dm.c index 28dcaae06993,86fd4420f128.. --- a/drivers/gpu/

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

7; 4902 | static u32 *emit_xcs_breadcrumb(struct i915_request *rq, u32 *cs) | ~^~ Caused by commit c94d65d2ff6d ("drm/i915/gt: Flush xcs before tgl breadcrumbs") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpKskYJwwc_a.pgp Description

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

Hi all, On Wed, 28 Oct 2020 12:06:31 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > > between commit: > > ff72bc403170 ("drm/amdgpu: Add debugfs entry fo

[Intel-gfx] linux-next: manual merge of the drm-msm 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/msm/disp/dpu1/dpu_crtc.c index e55be2922c2f,d4662e8184cc.. --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b

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

Hi all, On Tue, 3 Nov 2020 14:21:08 +1100 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.c > > between commit: > > e8a982355f96 ("drm/amd/display: Add tr

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

ner 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/display/intel_fbc.c index c125ca9ab9b3,56bcd6c52a02..

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

("drm/panel: add support for rm69299 visionox panel") -- Cheers, Stephen Rothwell pgpGRz0YJkcys.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 tree with the drm-intel-fixes tree

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/gem/i915_gem_domain.c index 4f96c8788a2e,af43e82f45c7.. --

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

racting with commits 606727842d8b ("drm/i915/gt: Include the execlists CCID of each port in the engine dump") 4c977837ba29 ("drm/i915/execlists: Peek at the next submission for error interrupts") from the drm tree. I have added teh following merge fix patch. From: Stephe

[Intel-gfx] linux-next: manual merge of the tip 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 pgpiZncHfmzaf.pgp Description: OpenPGP digital signature _

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

.c:63:13: note: declared here 63 | static void engine_heartbeat_enable(struct intel_engine_cs *engine, | ^~~ Caused by commit 1f65efb624c4 ("drm/i915/gt: Prevent timeslicing into unpreemptable requests") I have reverted that co

[Intel-gfx] linux-next: manual merge of the drm-intel-fixes tree with Linus' 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 diff --cc drivers/gpu/drm/i915/gt/intel_lrc.c index 87e6c5bdd2dc,e77f89b43e5f.. --- a/drivers/gpu/drm/i91

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

.c:64:13: note: declared here 64 | static void engine_heartbeat_enable(struct intel_engine_cs *engine, | ^~~ Caused by commit 04dc41776145 ("drm/i915/gt: Prevent timeslicing into unpreemptable requests") I have reverted that co

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

nflicts 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 pgpa_qPGIu8OS.pgp Descript

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

ocked Caused by commit ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()") interacting with commit fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs") from Linus' tree. I have applied the following merge fix up patch for today. From: Stephe

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

mmits for you to get conflicts against :-) -- Cheers, Stephen Rothwell pgp1cuMZEANkI.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-intel 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/i915/i915_drv.h index adb9bf34cf97,2697960f15a9.. --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i91

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

Hi all, On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function > 'amdgpu_amdkfd_gpuvm_fr

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

Hi Dave, On Wed, 24 Jun 2020 15:47:49 +1000 Dave Airlie wrote: > > My bad, my local builds passed, as I had made the change but forgot > the commit --amend > > Pushed out a new head with it in it now. Excellent, thanks. -- Cheers, Stephen Rothwell pgpiTA7UkNPQK.pgp Descr

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

g. 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_sdma.c index 28bdfb3ac33d,2a7a6f62d627.. --- a/drivers/gpu/drm/amd/amdg

[Intel-gfx] linux-next: manual merge of the drm-misc 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 diff --cc drivers/gpu/d

[Intel-gfx] linux-next: manual merge of the drm-intel 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/gvt/handlers.c index fadd2adb8030,26cae4846c82.. --- a/drivers/gpu/drm/i915/gvt

[Intel-gfx] linux-next: manual merge of the kspp 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/drm_edid.c index 252e89cb54a3,b98fa573e706.. --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@@ -3095,8 -3051

<    1   2   3   4   5   6   7   8   >