linux-next: build failure after merge of the drm-misc tree

~~ cc1: all warnings being treated as errors Caused by commit 962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()") I have used the drm-misc tree from next-20240402 for today. -- Cheers, Stephen Rothwell pgpHuhSODs95K.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the drm-intel tree

6: warning: Excess struct member 'operation_mode' description in 'drm_dp_as_sdp' Introduced by commit 0bbb8f594e33 ("drm/dp: Add Adaptive Sync SDP logging") -- Cheers, Stephen Rothwell pgph2aHlroqT0.pgp Description: OpenPGP digital signature

Re: [PATCH] drm/dp: correct struct member name in documentation

Hi Mitul, Thanks. On Fri, 5 Apr 2024 12:21:59 +0530 Mitul Golani wrote: > > Correct struct member name to 'mode' instead of 'operation mode' > in 'drm_dp_as_sdp' structure description. > > Fixes: 0bbb8f594e33 ("drm/dp: Add Adaptive Sync S

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

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

linux-next: build warning after merge of the drm-misc tree

ommit 9677547d8362 ("drm: Introduce plane SIZE_HINTS property") -- Cheers, Stephen Rothwell pgpJIpoyasKje.pgp Description: OpenPGP digital signature

Re: linux-next: build warning after merge of the drm-misc tree

Hi all, On Fri, 12 Apr 2024 16:58:26 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (htmldocs) > produced this warning: > > drivers/gpu/drm/drm_plane.c:1767: warning: expecting prototype for > drm_plane_add_size_hint_proper

linux-next: build warnings after merge of the drm-misc tree

; Introduced by commit 879b3b6511fe ("drm/fb_dma: Add generic get_scanout_buffer() for drm_panic") -- Cheers, Stephen Rothwell pgpSFv3JO44i2.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the drm-intel tree

t;) -- Cheers, Stephen Rothwell pgpApZRukCgBT.pgp Description: OpenPGP digital signature

linux-next: build failures after merge of the drm-misc tree

tion] 692 | debugfs_create_file("ops", 0644, crtc->debugfs_entry, lcrtc, | ^~~ | bus_create_file Caused by commits 9e2b84fb6cd7 ("drm/print: drop include seq_file.h") 33d5ae6cacf4 ("drm/print: drop include debugfs.h and incl

linux-next: build failure after merge of the drm-misc tree

^ drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is reported only once for each function it appears in Caused by commit a15710027afb ("drm/bridge: add support for TI TDP158") I have used the drm-misc t

linux-next: build warning after merge of the drm-misc-fixes tree

Hi all, After merging the drm-misc-fixes tree, today's linux-next build (htmldocs) produced this warning: Error: Cannot open file drivers/gpu/drm/drm_bridge_connector.c Introduced by commit 9da7ec9b19d8 ("drm/bridge-connector: move to DRM_DISPLAY_HELPER module") -- Cheers, S

linux-next: manual merge of the drm-xe 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/xe/display/xe_display.c index 303d00b99a68,75736faf2a80.. --- a/drivers/gpu/drm/xe/display/xe_display.c

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

Hi all, On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/display/xe_display.c > > between commit: > > 11d0613af7c5 ("drm/i915/display: include drm/

Re: linux-next: build warning after merge of the drm-misc-fixes tree

Hi all, On Wed, 4 Sep 2024 16:30:18 +1000 Stephen Rothwell wrote: > > After merging the drm-misc-fixes tree, today's linux-next build (htmldocs) > produced this warning: > > Error: Cannot open file drivers/gpu/drm/drm_bridge_connector.c > > Introduced by commit

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

state readout support for pixel_multiplier") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 6eb99e1,218bc93..

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

emove dead code from SDVO initialisation") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_sdvo.c index 7d31165,b8e1623..

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

_private/") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_fb.c index 3b03c3c,244060a..000 --- a/drivers/gpu/drm/i915

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

ot;) from Linus' tree and commits 6c49f24180c3 ("drm/i915: hw state readout support for pixel_multiplier") and 9222be993921 ("drm/i915: don't scream into dmesg when a modeset fails") from the drm-intel tree. I fixed it up (I think - see below) and can carry the fix as

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

rinkers-to-new-count-scan-api-fix" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index 8e57029,e743c27..000 --- a/dri

Re: [Intel-gfx] Adding drm-intel-fixes branch to linux-next

t what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You

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

e fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index 97afd26,20b10a0..000 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@@ -2666,27 -2673

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

/i915: kill dev_priv->rps.lock") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_dma.c index 095e3db,fd52de7..00

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

("drm/i915: Move active/inactive lists to new mm") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index 97afd26,9a52

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

t; from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index 50e26d3,a56feaa..000 --- a/drivers/gpu/drm/i915/i915_gem.c +

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

T access routines in the same file") from the drm-intel tree. I fixed it up (using the drm-intel tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpvRFii86KkM.pgp D

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

T access routines in the same file") from the drm-intel tree. I fixed it up (using the drm-intel tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpVz4Y7nqqc6.pgp D

[Intel-gfx] linux-next: problem fetching the drm-intel-fixes tree

Hi all, Trying to fetch the drm-intel-fixes tree (git://people.freedesktop.org/~danvet/drm-intel#drm-intel-fixes) this morning produced this error: fatal: remote error: access denied or repository not exported: ~danvet/drm-intel -- Cheers, Stephen Rothwells

Re: [Intel-gfx] linux-next: problem fetching the drm-intel-fixes tree

On Mon, 29 Jul 2013 10:08:43 +1000 Stephen Rothwell wrote: > > Hi all, > > Trying to fetch the drm-intel-fixes tree > (git://people.freedesktop.org/~danvet/drm-intel#drm-intel-fixes) this > morning produced this error: > > fatal: remote error: access denied or

Re: [Intel-gfx] linux-next: problem fetching the drm-intel-fixes tree

at the moment and anon git, > > I'll ask admin to look into it. Thanks. In the mean time, I will use what I fetched on Friday. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpYtjnHH0f6r.pgp Description: PGP signature __

Re: [Intel-gfx] linux-next: problem fetching the drm-intel-fixes tree

Hi Dave, On Mon, 29 Jul 2013 16:29:04 +1000 Dave Airlie wrote: > > Okay should all be back in place now. Excellent, thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp98zYRdc1W4.pgp Description: PGP signature ___

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

quot;) from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index d31e15d,49db617..000 --- a/drivers/gpu/drm/i915/i915_gem.c +

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

s non-snooped on non-LLC platforms") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem_context.c index d72db15afa02,30b355a

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

put for VT-d testing") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c index 154b0f8bb88d,496916298e8a..0

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

buf: use reservation objects") from the dma-buf tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem_dmabuf.c index 580aa42443ed,817ec444c976..0

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

g of user pages into video memory (userptr) ioctl") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_drv.h index d6dc54aa123a,d

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

y only contain stuff that depend on Linus' trees ... but here it include all of yesterday's drm tree as well. I have used the drm-intel-fixes tree from next-20140605 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.

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

X_CTL value to start a send") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index 2f517b85b3f4,0ef269053751..0

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

x27;TP_fast_assign' TP_fast_assign( ^ Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers from ring buffer in evict event"). I have used the drm-intel tree from next-20140318 for today. -- Cheers, Stephen Rothwell pgpqeWOMxmBp5.pgp Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

s to avoid confusion") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 3ffe5a6124f1,c31c6203c7ca..0

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

50, from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/gpu/drm/i915/intel_fbdev.c:27: drivers/gpu/drm/i915/intel_fbdev.c:494:34: error: 'struct drm_

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

er well arguments to force wake routines") from the drm-intel tree. I fixed it up (I just used the drm-intel-fixes version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxDS4IzY6Ur.pgp D

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

On Mon, 2 Dec 2013 12:04:37 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in > drivers/gpu/drm/i915/intel_display.c between commit a1216444283e > ("drm/i915: use the correct force_wake function at the PC8 code") from

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

e VDD when disabling the panel") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_ddi.c index 526c8ded16b0,cec06a5453cc..

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

multiple power wells") from the drm-intel tree. I fixed it up (the drm-intel-fixes tree patch also appears in the drm-intel so I just use the drm-intel tree version of this file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

K/SNB/IVB over to the HSW WM code") from the drm-intel tree. I fixed it up (I just removed the code removed by the drm-intel tree patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell pgpS_sf3mGy0a.

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

Sorry, I left you all off the cc list for this. Begin forwarded message: Date: Wed, 8 Jan 2014 12:50:55 +1100 From: Stephen Rothwell To: Dave Airlie Cc: linux-n...@vger.kernel.org, linux-ker...@vger.kernel.org, Alexander van Heukelum , Jani Nikula Subject: linux-next: manual merge of the drm

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

crtc_scanline()") from the drm-intel tree. I fixed it up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_irq.c index 17d8fcb1b6f7,ffb56a9db9cc..

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

pipe config per pipe") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 14b024becb91,e1d3ae1212a7..0

Re: [Intel-gfx] [PATCH] MAINTAINERS: Update drm/i915 git repo

names are still the same and I've checked that my scripts recreated > them all properly. So this should be good to go for the next -next. Thanks for letting me know - all updated now. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpedc5uMq1Uk.pgp Description: PGP

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

drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/drm_crtc.c index 54b4169,190827d..000 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/d

[Intel-gfx] linus-next: update to the drm-intel-fixes tree

have been in your drm-intel tree, right? (fetches more trees ...) And now, I discover that they are the latter :-) So your -fixes tree will be dropped, but all those patches will still be merged via you drm-intel tree. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpv

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

e_vma") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_gem.c index df9253d,d00d24f..000 --- a/drivers/gpu/drm/i915/i91

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

d state readout and checking for has_dp_encoder and dp_m_n") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_drv.h ind

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

LL for DSI") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index d8a1d98,2ed974e..000 --- a/drivers/gpu/

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

e mode handling into pipe_config") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index e5822e7,d12d563..

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

(see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index 1a431377d83b,1e3d2720d811.. --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_d

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

Hi Dave, On Mon, 28 Oct 2013 16:46:09 +1100 Stephen Rothwell wrote: > > @@@ -1486,8 -1542,8 +1562,8 @@@ static void intel_edp_psr_setup(struct > intel_edp_psr_write_vsc(intel_dp, &psr_vsc); > > /* Avoid continuous PSR exit by masking memup and hpd */

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

ght functions take a connector") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_panel.c index 09b2994c9b37,cad41ac330e8..0

Re: [Intel-gfx] Including drm-intel tree to linux-next

nit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participati

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

Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! I have dropped the tree for today. -- Cheers, Stephen Rothwells...@c

Re: [Intel-gfx] Including drm-intel tree to linux-next

g > from our QA, resulting in lots more regressions slipping through. > -next-queued is also what I run here on all my machines and what patch > development is usually based on for drm/i915. > > Does that put your concerns at ease? Some what, thanks. -- Cheers, Stephen

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

Hi Daniel, On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes wrote: > > On Fri, 15 Feb 2013 10:30:16 +0100 > Daniel Vetter wrote: > > > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell > > wrote: > > > > > > After merging the drm-in

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

915: rename some HDMI bit definitions") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_hdmi.c index fa8ec4a,4d222ec..

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

915_debugfs.c:(.text+0xb1bac): undefined reference to `__udivdi3' Caused by commit 2389cc500686 ("drm/i915: use simple attribute in debugfs routines") from the drm-intel tree. I have reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au

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

d it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index d7d4afe,92a7c62..000 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel

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

stuff into a struct") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_panel.c index bee8cb6,0e7e873..000 --- a/drivers/

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

quot;) from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_reg.h index 83f9c26,b5d87bd..000 --- a/drivers/gpu/drm/i915/i915_reg.h +

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

r #defines") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Daniel, I assume all this stuff being added to the drm-intel tree is going upstream very soon? -- Cheers, Stephen Rothwells...@canb.auug.org.au

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

Hi Daniel, On Tue, 7 May 2013 10:43:17 +0200 Daniel Vetter wrote: > > On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell > wrote: > > > > Daniel, I assume all this stuff being added to the drm-intel tree is > > going upstream very soon? > > Oops, no that is stuf

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

x27; tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index 3d704b7,2bb4009..000 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@@ -755,6

[Intel-gfx] linux-next: build warning after merge of the final tree (drm-intel tree related)

commit e4341d0356bc ("drm/i915: Be more informative when reporting "too large for aperture" error") from the drm-intel tree. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgp45GCfAueKF.pgp Description: PGP signature __

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

I effectively used the drm tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgplx4ZcSyvEJ.pgp Description: OpenPGP digital signature ___ I

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

ged quite a bit) from the drm tree. I fixed it up (I applied the former patch by hand to the file from the drm tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp_jotaDhmB5.pgp Description: OpenPGP di

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

ntel_fifo_underrun.c functions") from the drm tree. I fixed it up (I used the drm tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpkTUH6qj9lg.pgp Description:

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

ent const") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/drm_edid.c index a7b5a71856a7,2c1d2e49fb6f.. --- a/drivers

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

Hi Jani, On Wed, 03 Dec 2014 10:24:12 +0200 Jani Nikula wrote: > > On Wed, 03 Dec 2014, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm tree got a conflict in > > drivers/gpu/drm/i915/intel_display.c between commit b68362278af9 > > (&qu

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

ms-properties") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc Documentation/DocBook/drm.tmpl index 60c1063d4178,b344bc3b0d77.. --

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

edid argument const") and c465bbc87ce3 ("drm/edid: new drm_edid_block_checksum helper function V3") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au d

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

fy processing of the golden render context state") from the drm tree. I fixed it up (the latter appears to supercede the former, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc D

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

display wells during i915_pm_suspend") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). P.S. Daniel, that drm-intel tree commit has no Signed-off-by from its author ... -- Cheers, Stephen Rothwells...@canb.auug.org.

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

om the drm-intel tree. I fixed it up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index eda73ea3002f,9274ddfd78c7.. --- a/drivers/gpu/

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

e. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > Our tree seems to have the if blocks the other way round. I don't think > it matters, but Ville, Damien, chime in if you think it does. I have switched them arou

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

) Caused by commit a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3") Well, that was clearly never build tested :-( I have used the drm-misc tree from next-20150902 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au

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

Hi all, On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function > 'mdp5_plane_cleanup_fb'

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

up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/drm_dp_helper.c index 291734e87fca,5a55d905b8ee.. --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gp

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

quot;drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gp

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

ct drm_device *dev = priv->minor->dev; ^ Introduced by commit 3d2e74c94432 ("drm/core: Preserve the fb id on close.") -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing

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

m the akpm tree. I fixed it up (the former removed the instances of abs64 in thet file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@l

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

/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()") from the drm-intel tree. I fixed it up (I have no idea what do to here, so I just used the version from the drm-intel tree) and can carry the fix as necessary (no action is required - unless there is a better fix).

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

the same approach. OK, thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

usted mode 'adjusted_mode'") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_audio.c index 2a5c76faf9f8,b12df81e

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

primary plane to mask if it's visible") from the drm-intel tree. I fixed it up (I used the drm-intel tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au

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

emove the 'mode' argument from drm_select_eld()") from the drm-misc tree. I fixed it up (I used the drm-misc tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au ___

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

fcd3 ("drm/i915: Parametrize LRC registers") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_lrc.c index 7412caedcf7f,2

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

275c2f2bb ("drm/i915: set proper N/CTS in modeset") from the sound tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_audio.c index

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

; [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined! ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined! Not quite sure which commit cau

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

a previous gfx force-off") from the drm-intel tree (which also appeared as commit c9c52e24194a in Linus' tree before v4.0). I fixed it up (I used the version from Linus' tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

ype [-Woverflow] ppgtt->base.total = 1ULL << 32; ^ Introduced by commit 5c5f645773b6 ("drm/i915: Unify aliasing ppgtt handling"). "total" is a size_t, so unsigned 32 bit on i386. -- Cheers, Stephen Rothwells...@canb.auug.org

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

(v2)") from the drm-intel tree. I fixed it up (the former removed the code modified by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp9p0gpQGCRE.pgp Description:

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

rmediate variable to avoid repeating ourselves") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index

<    2   3   4   5   6   7   8   >