-next merged with Linus tree

-next merged with Linus tree

[Dave Airlie]

Hi,

I've just merged Linus tree into drm-next and fixes up the conflicts,
some in i915, one in radeon.

Can you guys check that they look correct after it?

I'll leave it just on my drm-next branch for now.

Thanks,
Dave.

Re: -next merged with Linus tree

[Christian König]

On 20.07.2012 07:34, Dave Airlie wrote:
> Hi,
>
> I've just merged Linus tree into drm-next and fixes up the conflicts,
> some in i915, one in radeon.
>
> Can you guys check that they look correct after it?
Have to test it a bit more, but at least 
drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.

Christian.

>
> I'll leave it just on my drm-next branch for now.
>
> Thanks,
> Dave.
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>

Re: -next merged with Linus tree

[Jerome Glisse]

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

On Fri, Jul 20, 2012 at 4:47 AM, Christian König
<deathsimple@vodafone.de> wrote:
> On 20.07.2012 07:34, Dave Airlie wrote:
>>
>> Hi,
>>
>> I've just merged Linus tree into drm-next and fixes up the conflicts,
>> some in i915, one in radeon.
>>
>> Can you guys check that they look correct after it?
>
> Have to test it a bit more, but at least
> drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.
>
> Christian.
>
>
>>
>> I'll leave it just on my drm-next branch for now.
>>
>> Thanks,
>> Dave.

Attached patch fix something that have been lost.

Cheers,
Jerome

[-- Attachment #2: 0001-drm-radeon-don-t-unreference-a-possibly-invalid-poin.patch --]
[-- Type: application/octet-stream, Size: 956 bytes --]

From e88432024a2c19db32773c1ab496d37660edef54 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Fri, 20 Jul 2012 09:45:08 -0400
Subject: [PATCH] drm/radeon: don't unreference a possibly invalid pointer

After drm_gem_object_unreference_unlocked robj might be invalid.
So avoid unreferencing it.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_gem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 84d0452..0e8f7e8 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -266,7 +266,7 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
 
 	drm_gem_object_unreference_unlocked(gobj);
 	up_read(&rdev->exclusive_lock);
-	r = radeon_gem_handle_lockup(robj->rdev, r);
+	r = radeon_gem_handle_lockup(rdev, r);
 	return r;
 }
 
-- 
1.7.10.4


[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: -next merged with Linus tree

[Christian König]

On 20.07.2012 16:12, Jerome Glisse wrote:
> On Fri, Jul 20, 2012 at 4:47 AM, Christian König
> <deathsimple@vodafone.de> wrote:
>> On 20.07.2012 07:34, Dave Airlie wrote:
>>> Hi,
>>>
>>> I've just merged Linus tree into drm-next and fixes up the conflicts,
>>> some in i915, one in radeon.
>>>
>>> Can you guys check that they look correct after it?
>> Have to test it a bit more, but at least
>> drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.
>>
>> Christian.
>>
>>
>>> I'll leave it just on my drm-next branch for now.
>>>
>>> Thanks,
>>> Dave.
> Attached patch fix something that have been lost.
Ups, yes indeed. The patch itself is:

Reviewed-by: Christian König <christian.koenig@amd.com>

>
> Cheers,
> Jerome

Re: -next merged with Linus tree

[Jerome Glisse]

On Fri, Jul 20, 2012 at 10:32 AM, Christian König
<deathsimple@vodafone.de> wrote:
> On 20.07.2012 16:12, Jerome Glisse wrote:
>>
>> On Fri, Jul 20, 2012 at 4:47 AM, Christian König
>> <deathsimple@vodafone.de> wrote:
>>>
>>> On 20.07.2012 07:34, Dave Airlie wrote:
>>>>
>>>> Hi,
>>>>
>>>> I've just merged Linus tree into drm-next and fixes up the conflicts,
>>>> some in i915, one in radeon.
>>>>
>>>> Can you guys check that they look correct after it?
>>>
>>> Have to test it a bit more, but at least
>>> drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.
>>>
>>> Christian.
>>>
>>>
>>>> I'll leave it just on my drm-next branch for now.
>>>>
>>>> Thanks,
>>>> Dave.
>>
>> Attached patch fix something that have been lost.
>
> Ups, yes indeed. The patch itself is:
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>

Btw i am still reading code btw build, but so far so good beside my patch.

Cheers,
Jerome