From: Daniel Vetter <daniel@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Dave Airlie <airlied@gmail.com>
Cc: DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: Updated -next
Date: Fri, 27 Apr 2012 15:44:17 +0200 [thread overview]
Message-ID: <20120427134416.GA5147@phenom.ffwll.local> (raw)
In-Reply-To: <20120427114542.GC4841@phenom.ffwll.local>
On Fri, Apr 27, 2012 at 01:45:42PM +0200, Daniel Vetter wrote:
> Hi Dave,
>
> A new drm-intel-next pull. Highlights:
> - More gmbus patches from Daniel Kurtz, I think gmbus is now ready, all
> known issues fixed.
> - Fencing cleanup and pipelined fencing removal from Chris.
> - rc6 residency interface from Ben, useful for powertop.
> - Cleanups and code reorg around the ringbuffer code (Ben&me).
> - Use hw semaphores in the pageflip code from Ben.
> - More vlv stuff from Jesse, unfortunately his vlv cpu is doa, so less
> merged than I've hoped for - we still have the unused function warning :(
> - More hsw patches from Eugeni, again, not yet enabled fully.
> - intel_pm.c refactoring from Eugeni.
> - Ironlake sprite support from Chris.
> - And various smaller improvements/fixes all over the place.
>
> Note that this pull request also contains a backmerge of -rc3 to sort out
> a few things in -next. I've also had to frob the shortlog a bit to exclude
> anything that -rc3 brings in with this pull.
>
> Regression wise we have a few strange bugs going on, but for all of them
> closer inspection revealed that they've been pre-existing, just now
> slightly more likely to be hit. And for most of them we have a patch
> already. Otherwise QA has not reported any regressions, and I'm also not
> aware of anything bad happening in 3.4.
>
> For 3.4 Ken discovered that one of the snb workarounds in -next is
> required to fix hangs in google maps and tons of other apps, so expect
> another -fixes pull.
>
> Cheers, Daniel
>
>
> The following changes since commit effbc4fd8e37e41d6f2bb6bcc611c14b4fbdcf9b:
>
> Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next (2012-04-12 10:27:01 +0100)
>
> are available in the git repository at:
>
>
> git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-04-23
I've forgot to mention that this branch has a very funky conflict with
Linus' tree. Essentially it's just a few patches touching the same file
(not even the same functions), but the git diff algo gets completely
confused and thinks that the drm-intel-next branch completely rewrote
large parts of intel_display.c. In truth we've just moved a few functions
out of intel_display.c into intel_pm.c. But because the part in
intel_display.c where git is all confused about is also changed in the 3.4
tree, and we have a merge conflict where none should be.
drm-intel-testing has the merge resolution, in case anyone needs it.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
next prev parent reply other threads:[~2012-04-27 13:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 16:40 Updated -next Daniel Vetter
2012-04-23 7:39 ` Daniel Vetter
2012-04-23 7:40 ` Sun, Yi
2012-04-27 11:45 ` Daniel Vetter
2012-04-27 13:44 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-22 14:33 updated -next Daniel Vetter
2012-06-21 8:25 Updated -next Daniel Vetter
2012-06-04 20:59 Daniel Vetter
2012-06-12 8:37 ` Daniel Vetter
2012-05-06 19:09 Daniel Vetter
2012-04-05 9:45 Daniel Vetter
2012-04-09 16:19 ` Daniel Vetter
2012-04-10 2:09 ` Sun, Yi
2012-04-11 3:20 ` Sun, Yi
2012-04-11 7:54 ` Paul Menzel
2012-04-11 8:24 ` Sun, Yi
2012-04-11 9:45 ` Paul Menzel
2012-03-23 10:03 Daniel Vetter
2012-03-29 7:38 ` Sun, Yi
2012-03-01 20:59 Daniel Vetter
2012-03-08 8:10 ` Sun, Yi
2012-03-18 21:20 ` Daniel Vetter
2012-02-16 17:27 updated -next Daniel Vetter
2012-02-17 17:56 ` Jesse Barnes
2012-02-21 7:45 ` Sun, Yi
2012-02-07 22:59 Daniel Vetter
2012-01-20 10:10 Updated -next Daniel Vetter
2012-01-21 4:15 ` Sun, Yi
2012-01-21 14:12 ` Daniel Vetter
2012-01-21 19:45 ` Alan W. Irwin
2012-01-31 9:07 ` Jin, Gordon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120427134416.GA5147@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).