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

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 Description: PGP signature

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

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.au diff --cc drivers/gpu/drm

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

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/drm/i915/intel_dp.c +++ b

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

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..000 --- a/drivers/gpu/drm/i915

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

) 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..000 --- a/drivers/gpu/drm/i915/intel_sdvo.c

[Intel-gfx] linux-next: manual merge of the drm-intel tree with 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 necessary (no action is required). -- Cheers, Stephen Rothwell

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

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/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers

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

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 may be sent e-mail messages indicating errors or other issues when the patches/commits from

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

the drm-intel-fixes tree and commits f343c5f64773 (drm/i915: Getter/setter for object attributes) and db1b76ca6a79 (drm/i915: don't frob mm.suspended when not using ums) from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen

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

-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..000 --- a/drivers/gpu/drm/i915

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

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,9a523df..000 --- a/drivers/gpu/drm/i915

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

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 +++ b/drivers/gpu/drm/i915/i915_gem.c

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

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 Description: PGP signature

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

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 Description: PGP signature

[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 s...@canb.auug.org.au 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 repository

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

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 ___ Intel-gfx mailing list Intel

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 airl...@gmail.com 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

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 +++ b/drivers/gpu/drm/i915

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

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/drm/drm_crtc.c @@@ -186,22 -193,23

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

) 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.. --- a/drivers/gpu/drm/i915

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

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.. --- a/drivers/gpu

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

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,d2da390b6b9f..

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

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.au signature.asc Description: PGP signature

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

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 Description: PGP signature

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 s...@canb.auug.org.au 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 the drm-intel

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

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.. --- a/drivers/gpu/drm/i915

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

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 Rothwells...@canb.auug.org.au

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

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 s...@canb.auug.org.au pgpS_sf3mGy0a.pgp Description: PGP signature

[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 s...@canb.auug.org.au To: Dave Airlie airl...@linux.ie Cc: linux-n...@vger.kernel.org, linux-ker...@vger.kernel.org, Alexander van Heukelum heuke...@fastmail.fm

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

-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.. --- a/drivers/gpu/drm/i915

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

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.. --- a/drivers/gpu/drm/i915

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

about this. Branch 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

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

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.. --- a/drivers/gpu/drm

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

-20140318 for today. -- Cheers, Stephen Rothwell s...@canb.auug.org.au 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

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.. --- a/drivers/gpu/drm/i915

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

with primary plane fb (v3)) from the drm tree interacting with various commits in the drm-intel tree. I applied this merge fix patch: From 8b74d715803f3c8e0e76b907d8877e1355d29a31 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell s...@canb.auug.org.au Date: Thu, 3 Apr 2014 12:18:47 +1100 Subject: [PATCH

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

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,30b355afb362..

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

). 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 may be sent e-mail messages indicating errors

[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...@canb.auug.org.au pgpLVsDkTPhcY.pgp

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

, 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 Rothwells...@canb.auug.org.au

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 jbar...@virtuousgeek.org wrote: On Fri, 15 Feb 2013 10:30:16 +0100 Daniel Vetter daniel.vet...@ffwll.ch wrote: On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell s...@canb.auug.org.au wrote: After merging the drm-intel

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

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..000 --- a/drivers/gpu/drm/i915

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

+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 pgpLGEoWS5NkQ.pgp Description: PGP

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

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_dp.c @@@ -850,10 -792,10 +802,10

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

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/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm 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 +++ b/drivers/gpu/drm/i915

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

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 diff --cc drivers/gpu/drm/i915

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 daniel.vet...@ffwll.ch wrote: On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Daniel, I assume all this stuff being added to the drm-intel tree is going upstream very soon? Oops, no that is stuff

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

, 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 -782,10 +783,8 @@@ found target_clock

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

? (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 pgpvp_Gay9CY8.pgp Description: PGP signature

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

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/i915_gem.c +++ b/drivers/gpu/drm

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

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 index 28cae80,b85354f..000 --- a/drivers

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

-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/drm/i915/intel_display.c +++ b

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

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..000 --- a/drivers/gpu/drm/i915

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

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_dp.c @@@ -1402,31 -1469,20 +1469,40 @@@ static void

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 s...@canb.auug.org.au 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

) 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.. --- a/drivers/gpu/drm

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

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 digital signature

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

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: OpenPGP digital signature

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

-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/gpu/drm/drm_edid.c +++ b/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 jani.nik...@intel.com wrote: On Wed, 03 Dec 2014, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/intel_display.c between commit b68362278af9 (drm/i915

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

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.. --- a/Documentation/DocBook/drm.tmpl

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

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: OpenPGP digital signature

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

as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgplx4ZcSyvEJ.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman

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

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 3117679299a6,2ac93909cfc5.. --- a/drivers/gpu/drm/i915

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

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 bf19a5cce4a8,2ac93909cfc5..

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

structure) 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 8727086cf48c,239a382c8b55.. --- a/drivers/gpu/drm

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

) 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 Rothwells...@canb.auug.org.au pgp9mEldANZFM.pgp

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

] 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.au pgph3sQqaUZRB.pgp Description: OpenPGP digital

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

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 around today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpq3rUl5_7m4.pgp Description: OpenPGP

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

carry the fix as necessary (no action is required). -- 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-misc tree with Linus' tree

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_crtc.c index c91c18b2b1d4,7d02e32b4e94.. --- a/drivers/gpu/drm/drm_crtc.c +++ b

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

connectors_changed to separate it from mode_changed, v2) 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_atomic_helper.c index

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

updated by the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo

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

-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_irq.c index ee14324522ce,70919d48f015.. --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers

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

') Introduced by commit b90180b057f7 (drm/irq: More pipe/crtc consistency cleanups) -- Cheers, Stephen Rothwells...@canb.auug.org.au ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman

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

said COMPILE TESTED ONLY :-() -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5cB7wGZvSm.pgp Description: OpenPGP digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman

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

:322:18: warning: unused variable 'pdev' [-Wunused-variable] struct pci_dev *pdev = dev-pdev; ^ Caused by commit 237fc6452ca5 (drm/nouveau: Use new drm_fb_helper functions) I think COMPILE TESTED ONLY should at least include eliminating such warnings ... -- Cheers, Stephen

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

to go on and on as the files get changed. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 85ac6d85dc39,00c60c1c5162.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c

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

rid of intel_crtc_disable and related code, v3) 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 30e0f54ba19d

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

pipe in public API") 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/i915/i915_irq.c index e24378ee7eda,bc732eb52b50.. -

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

parameter to {en, dis}able zero address mapping) 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

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

obsolete 'outstanding_lazy_request') 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_ringbuffer.h index 4be66f60504d

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

, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index ba9321998a41,4bcbff9793d4.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -4851,25 -4800,13 +4800,16 @@@ static void

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

dma mapped pages) 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 dcc6a88c560e,ed65f24867b4..

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

failure, unref gem object where it gets refed") 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 8f80b

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

tested the combined branches). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 98eaea3e5ed6,e78bd7f69d72.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -14583,14 -14364,12

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 <s...@canb.auug.org.au> 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_plan

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

m/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 ___ Intel-gfx

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

elow) 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/gpu/drm/drm_

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

915: 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/gpu/drm/i915/i915_irq.

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

f2bb ("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 b08b4

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

("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,256167

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

ivers/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 caused t

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

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 ma

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

'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,b12df81e4dcc.. -

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

' 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-gf

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

you > should resolve it with 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 akpm tree with the drm-misc tree

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@lists.

  1   2   3   4   5   6   7   >