From: Chris Wilson <chris@chris-wilson.co.uk>
To: Pavel Machek <pavel@ucw.cz>, Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Dave Airlie <airlied@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Dave Airlie <airlied@linux.ie>, Eric Anholt <eric@anholt.net>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-kernel@vger.kernel.org,
DRI mailing list <dri-devel@lists.freedesktop.org>
Subject: Re: [git pull] drm for rc1
Date: Tue, 11 Jan 2011 14:14:52 +0000 [thread overview]
Message-ID: <0d30dc$knd39a@orsmga001.jf.intel.com> (raw)
In-Reply-To: <20110111133329.GD10705@atrey.karlin.mff.cuni.cz>
On Tue, 11 Jan 2011 14:33:29 +0100, Pavel Machek <pavel@ucw.cz> wrote:
> Hi!
>
> > >>> Highlights:
> > >>> core/drivers: add support for high precision vblank timestamps
> > >>> radeon: pageflipping support, Gen2 PCIE support
> > >>> nouveau: reworked VRAM and VM support
> > >>> intel: better ILK/SNB powersaving support, Full GTT support
> > >>
> > >> Lowlights: it's broken.
>
> Heh, at this point I expected Linus to complain about milion merges in
> changelog...
Applying bug fixes to one tree and pushing those to 2.6.37 and doing
feature work in another which also depend upon those same bug fixes...
The merges I felt were fairly infrequent, either after a pull request and
subsequent fast-forward of -fixes (so that -next was always a superset of
the current upstream rc) or I applied a patch to -fixes that would
conflict with -next. After those, I did an immediate merge to resolve the
conflict whilst the code was still fresh.
The whole point of trying to keep two trees intact is to be able to
perform continuous testing on both. No matter how hard I try not to, it
seems I always break Linus's machine.
> > Arg. It's been ok on my ILK systems, but Chris has found some
> >issues with out watermarking code iirc; apparently we're underflowing
> >the display FIFO, causing all sorts of trouble. If it works before
> >the pull of Dave's tree, can you bisect?
>
> Watermarking code? What goes on there?
FIFO watermarks, they determine when the display fetches from the scanout
buffer to fill the pipe. If we run out of FIFO entries then the display
flickers at best, at worst we may hard hang the machine.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2011-01-11 14:15 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-10 22:59 [git pull] drm for rc1 Dave Airlie
2011-01-11 4:16 ` Linus Torvalds
2011-01-11 4:48 ` Dave Airlie
2011-01-11 4:48 ` Dave Airlie
2011-01-11 4:51 ` Dave Airlie
2011-01-11 10:58 ` Chris Wilson
2011-01-11 10:58 ` Chris Wilson
2011-01-11 6:06 ` Jesse Barnes
2011-01-11 6:06 ` Jesse Barnes
2011-01-11 6:28 ` Dave Airlie
2011-01-11 6:28 ` Dave Airlie
2011-01-11 7:04 ` Dave Airlie
2011-01-11 10:35 ` Anca Emanuel
2011-01-11 13:33 ` Pavel Machek
2011-01-11 14:14 ` Chris Wilson [this message]
2011-02-23 18:53 ` Pavel Machek
2011-01-11 16:01 ` Linus Torvalds
2011-01-11 16:11 ` Anca Emanuel
2011-01-11 16:25 ` Anca Emanuel
2011-01-11 17:58 ` Anca Emanuel
2011-01-11 19:00 ` Linus Torvalds
2011-01-11 19:00 ` Linus Torvalds
2011-01-11 19:12 ` Jesse Barnes
2011-01-11 19:25 ` Linus Torvalds
2011-01-11 19:45 ` Jesse Barnes
2011-01-11 19:53 ` Linus Torvalds
2011-01-11 20:05 ` Chris Wilson
2011-01-11 22:16 ` Linus Torvalds
2011-01-11 22:31 ` Chris Wilson
2011-01-11 23:01 ` Linus Torvalds
2011-01-12 1:36 ` Linus Torvalds
2011-01-12 1:36 ` Linus Torvalds
2011-01-12 1:54 ` Dave Airlie
2011-01-11 23:20 ` Christian Borntraeger
2011-01-11 23:28 ` Linus Torvalds
2011-01-11 23:28 ` Linus Torvalds
2011-01-12 11:21 ` Christian Borntraeger
2011-01-12 12:49 ` James Simmons
2011-01-12 13:03 ` Christian Borntraeger
2011-01-12 13:32 ` James Simmons
2011-01-12 13:45 ` Christian Borntraeger
2011-01-12 15:55 ` Linus Torvalds
2011-01-12 16:39 ` James Simmons
2011-01-12 13:36 ` Anca Emanuel
2011-01-12 13:45 ` James Simmons
2011-01-12 13:55 ` Anca Emanuel
2011-01-12 13:55 ` Anca Emanuel
2011-01-12 14:35 ` Christian Borntraeger
2011-01-12 16:53 ` James Simmons
2011-01-12 15:13 ` Anca Emanuel
2011-01-12 15:25 ` Anca Emanuel
2011-01-12 15:40 ` James Simmons
2011-01-12 15:55 ` Anca Emanuel
2011-01-12 15:55 ` Anca Emanuel
2011-01-13 17:55 ` James Simmons
2011-01-13 19:53 ` Anca Emanuel
2011-01-14 16:29 ` Anca Emanuel
2011-01-14 16:29 ` Anca Emanuel
2011-01-14 16:38 ` James Simmons
2011-01-14 18:22 ` Anca Emanuel
2011-01-14 18:26 ` James Simmons
2011-01-14 18:40 ` Anca Emanuel
2011-01-14 18:40 ` Anca Emanuel
2011-01-14 19:02 ` Anca Emanuel
2011-02-19 15:14 ` Alex Riesen
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='0d30dc$knd39a@orsmga001.jf.intel.com' \
--to=chris@chris-wilson.co.uk \
--cc=airlied@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.