All of lore.kernel.org
 help / color / mirror / Atom feed
* [git pull] drm/radeon: reset ring saving branch
@ 2012-07-17  9:39 Christian König
  2012-07-17  9:46 ` Dave Airlie
  0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2012-07-17  9:39 UTC (permalink / raw)
  To: Dave Airlie, DRI mailing list

Hi Dave,

I think it is easier if I just send you a pull request of my branch 
instead of individual patches.

So please pull the this branch into -next:
     git://people.freedesktop.org/~deathsimple/linux next

It contains the following changes:

Christian König (14):
       drm/radeon: add error handling to fence_wait_empty_locked
       drm/radeon: add error handling to radeon_vm_unbind_locked
       drm/radeon: fix fence related segfault in CS
       drm/radeon: fix ring commit padding
       drm/radeon: fix fence value access
       drm/radeon: fix fence init after resume
       drm/radeon: remove FIXME comment from chipset suspend
       drm/radeon: make cp init on cayman more robust
       drm/radeon: remove ip_pool start/suspend
       drm/radeon: remove r600_blit_suspend
       drm/radeon: remove vm_manager start/suspend
       drm/radeon: move radeon_ib_ring_tests out of chipset code
       drm/radeon: record what is next valid wptr for each ring v4
       drm/radeon: implement ring saving on reset v4

Jerome Glisse (1):
       drm/radeon: add an exclusive lock for GPU reset v2

All patches have been on the list for quite a while and contain the 
necessary Signed-off-by and Reviewed-by lines.

Cheers,
Christian.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [git pull] drm/radeon: reset ring saving branch
  2012-07-17  9:39 [git pull] drm/radeon: reset ring saving branch Christian König
@ 2012-07-17  9:46 ` Dave Airlie
  2012-07-17 10:04   ` Christian König
  0 siblings, 1 reply; 4+ messages in thread
From: Dave Airlie @ 2012-07-17  9:46 UTC (permalink / raw)
  To: Christian König; +Cc: DRI mailing list

On Tue, Jul 17, 2012 at 7:39 PM, Christian König
<deathsimple@vodafone.de> wrote:
> Hi Dave,
>
> I think it is easier if I just send you a pull request of my branch instead
> of individual patches.

Thanks for this, I've been getting lost as to what is where, so I'll
pull this in and put Alex's documentation patches on top.

Dave.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [git pull] drm/radeon: reset ring saving branch
  2012-07-17  9:46 ` Dave Airlie
@ 2012-07-17 10:04   ` Christian König
  2012-07-17 10:14     ` Dave Airlie
  0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2012-07-17 10:04 UTC (permalink / raw)
  To: Dave Airlie; +Cc: DRI mailing list

On 17.07.2012 11:46, Dave Airlie wrote:
> On Tue, Jul 17, 2012 at 7:39 PM, Christian König
> <deathsimple@vodafone.de> wrote:
>> Hi Dave,
>>
>> I think it is easier if I just send you a pull request of my branch instead
>> of individual patches.
> Thanks for this, I've been getting lost as to what is where, so I'll
> pull this in and put Alex's documentation patches on top.
>
Please note that between this patchset and Alex documentation patches 
there are still three patches from me left that haven't got the required 
review yet.

So I guess that Alex patches don't apply cleanly ontop of this branch. 
If you don't mind I can collect those for you and just send you another 
pull request when we are done with it.

Christian.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [git pull] drm/radeon: reset ring saving branch
  2012-07-17 10:04   ` Christian König
@ 2012-07-17 10:14     ` Dave Airlie
  0 siblings, 0 replies; 4+ messages in thread
From: Dave Airlie @ 2012-07-17 10:14 UTC (permalink / raw)
  To: Christian König; +Cc: DRI mailing list

On Tue, Jul 17, 2012 at 8:04 PM, Christian König
<deathsimple@vodafone.de> wrote:
> On 17.07.2012 11:46, Dave Airlie wrote:
>>
>> On Tue, Jul 17, 2012 at 7:39 PM, Christian König
>> <deathsimple@vodafone.de> wrote:
>>>
>>> Hi Dave,
>>>
>>> I think it is easier if I just send you a pull request of my branch
>>> instead
>>> of individual patches.
>>
>> Thanks for this, I've been getting lost as to what is where, so I'll
>> pull this in and put Alex's documentation patches on top.
>>
> Please note that between this patchset and Alex documentation patches there
> are still three patches from me left that haven't got the required review
> yet.
>
> So I guess that Alex patches don't apply cleanly ontop of this branch. If
> you don't mind I can collect those for you and just send you another pull
> request when we are done with it.

Sounds good to me.

Thanks,
Dave.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-17 10:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-17  9:39 [git pull] drm/radeon: reset ring saving branch Christian König
2012-07-17  9:46 ` Dave Airlie
2012-07-17 10:04   ` Christian König
2012-07-17 10:14     ` Dave Airlie

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.