Hi Linus,
one edid fix from X.org parser,
some more drm regression fixes, one 33 second pause at boot bug solved,
two nouveau issues, one vmwgfx staging fix to use proper mechanism to do
framebuffer handover,
For 2.6.34 we've lined up a command stream checker for r600, however
it already found two issues and we've backported the patches from Jerome
to solve some r600 lockups we've been seeing a lot off in the field but
funnily not on any of my or Jerome's systems.
Dave.
The following changes since commit e803e8b2628f3e9a42f45c5b7bb1f9821b08352c:
Dave Airlie (1):
drm/radeon/kms: make sure retry count increases.
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus
Adam Jackson (1):
drm/edid: Fix interlaced detailed timings to be frame size, not field.
Ben Skeggs (1):
drm/nouveau: use mutex for vbios lock
Dave Airlie (2):
drm/radeon/kms: use udelay for short delays
Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-linus
Francisco Jerez (1):
drm/nouveau: Force TV encoder DPMS reinit after resume.
Jerome Glisse (2):
drm/radeon/kms: fix indirect buffer management V2
drm/radeon/kms: fix bo's fence association
Thomas Hellstrom (1):
drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
drivers/gpu/drm/drm_edid.c | 47 ++++++++++++++-
drivers/gpu/drm/nouveau/nouveau_bios.c | 7 +-
drivers/gpu/drm/nouveau/nouveau_bios.h | 2 +-
drivers/gpu/drm/nouveau/nv17_tv.c | 2 +
drivers/gpu/drm/radeon/atom.c | 2 +-
drivers/gpu/drm/radeon/r600_blit_kms.c | 3 -
drivers/gpu/drm/radeon/radeon.h | 9 ++-
drivers/gpu/drm/radeon/radeon_cs.c | 10 +--
drivers/gpu/drm/radeon/radeon_object.c | 36 +++++------
drivers/gpu/drm/radeon/radeon_object.h | 4 +-
drivers/gpu/drm/radeon/radeon_ring.c | 105 ++++++++++++--------------------
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 49 +++++----------
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 +
13 files changed, 137 insertions(+), 142 deletions(-)
W dniu 30 marca 2010 09:07 użytkownik Dave Airlie <[email protected]> napisał:
> 2010/3/30 Dave Airlie <[email protected]>:
>>
>> [re-pull request]
>
> Actually Linus, don't bother, consider this revoked, I'm going to kill
> the GPU reset code
> and re-send this tomorrow, its just a mess to get it back out of the
> tree at this point,
Ping? Are you waiting for Jerome or something? Please do not stop
pulling whole stuff because Jerome is preparing some patch for last
moment.
I believe I'll be much better to pull most stuff ASAP to let ppl test
it, and later eventually ask Linus to get some one-two additional
small patches.
--
Rafał
2010/4/1 Rafa? Mi?ecki <[email protected]>:
> W dniu 30 marca 2010 09:07 u?ytkownik Dave Airlie <[email protected]> napisa?:
>> 2010/3/30 Dave Airlie <[email protected]>:
>>>
>>> [re-pull request]
>>
>> Actually Linus, don't bother, consider this revoked, I'm going to kill
>> the GPU reset code
>> and re-send this tomorrow, its just a mess to get it back out of the
>> tree at this point,
>
> Ping? Are you waiting for Jerome or something? Please do not stop
> pulling whole stuff because Jerome is preparing some patch for last
> moment.
>
> I believe I'll be much better to pull most stuff ASAP to let ppl test
> it, and later eventually ask Linus to get some one-two additional
> small patches.
Rebasing out Jerome's patches and reverifying stuff works isn't
something that takes 5 minutes. Since the rebase pretty much
negates all the testing I'd done.
Dave.
W dniu 1 kwietnia 2010 09:43 użytkownik Dave Airlie <[email protected]> napisał:
> 2010/4/1 Rafał Miłecki <[email protected]>:
>> W dniu 30 marca 2010 09:07 użytkownik Dave Airlie <[email protected]> napisał:
>>> 2010/3/30 Dave Airlie <[email protected]>:
>>>>
>>>> [re-pull request]
>>>
>>> Actually Linus, don't bother, consider this revoked, I'm going to kill
>>> the GPU reset code
>>> and re-send this tomorrow, its just a mess to get it back out of the
>>> tree at this point,
>>
>> Ping? Are you waiting for Jerome or something? Please do not stop
>> pulling whole stuff because Jerome is preparing some patch for last
>> moment.
>>
>> I believe I'll be much better to pull most stuff ASAP to let ppl test
>> it, and later eventually ask Linus to get some one-two additional
>> small patches.
>
> Rebasing out Jerome's patches and reverifying stuff works isn't
> something that takes 5 minutes. Since the rebase pretty much
> negates all the testing I'd done.
Oh, OK. Thanks for your work on getting 2.6.34 into nice shape :)
--
Rafał