Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-05 Thread Alex Deucher
On Tue, Dec 5, 2017 at 4:18 AM, Lucas Stach  wrote:
> Hi Alex,
>
> Am Montag, den 04.12.2017, 16:47 -0500 schrieb Alex Deucher:
>> On Fri, Dec 1, 2017 at 10:55 AM, Christian König
>> >  wrote:
>> > Am 01.12.2017 um 16:28 schrieb Lucas Stach:
>> > >
>> > > Hi all,
>> > >
>> > > so this is the first step to make the marvelous AMDGPU scheduler useable
>> > > for other drivers. I have a (mostly) working prototype of Etnaviv using
>> > > the scheduler, but those patches need to keep baking for a while.
>> > >
>> > > I'm sending this out as I want to avoid rebasing this change too much
>> > > and don't want to take people by surprise when the Etnaviv implementation
>> > > surfaces. Also this might need some coordination between AMDGPU and
>> > > Etnaviv, which might be good to get going now.
>> > >
>> > > Please speak up now if you have any objections or comments.
>> >
>> >
>> > Looks good to me, but question is what is this based upon?
>> >
>> > I strongly assume drm-next, so question is now if we have any patches 
>> > inside
>> > amd branches we should apply before doing this.
>>
>> We have a bunch of changes queued up which will go usptream for 4.16.
>> See amd-staging-drm-next:
>> https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-drm-next
>> which is a mirror of our main development branch or:
>> https://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next-4.16-wip
>> which is what is currently queued for 4.16.
>
> Is this branch/tag stable?
>

amd-staging-drm-next rebases periodically.  The wip branches are not
stable.  I'll be sending out a pull request for 4.16 in the next day
or two and that branch (drm-next-4.16) will be stable.

> How would you like to handle the merge? Should I send out patches for
> you to apply and you get me a stable branch to pull into etnaviv, or
> should I provide a stable branch based on the above to pull into both
> amdgpu and etnaviv?

If you want to send patches against amd-staging-drm-next, I can pull
them into our system and include them in my next pull request after
we've tested them internally.  At that point, you can either pull my
stable branch or wait until it gets into Dave's drm-next branch.

Alex
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-05 Thread Lucas Stach
Hi Alex,

Am Montag, den 04.12.2017, 16:47 -0500 schrieb Alex Deucher:
> On Fri, Dec 1, 2017 at 10:55 AM, Christian König
> >  wrote:
> > Am 01.12.2017 um 16:28 schrieb Lucas Stach:
> > > 
> > > Hi all,
> > > 
> > > so this is the first step to make the marvelous AMDGPU scheduler useable
> > > for other drivers. I have a (mostly) working prototype of Etnaviv using
> > > the scheduler, but those patches need to keep baking for a while.
> > > 
> > > I'm sending this out as I want to avoid rebasing this change too much
> > > and don't want to take people by surprise when the Etnaviv implementation
> > > surfaces. Also this might need some coordination between AMDGPU and
> > > Etnaviv, which might be good to get going now.
> > > 
> > > Please speak up now if you have any objections or comments.
> > 
> > 
> > Looks good to me, but question is what is this based upon?
> > 
> > I strongly assume drm-next, so question is now if we have any patches inside
> > amd branches we should apply before doing this.
> 
> We have a bunch of changes queued up which will go usptream for 4.16.
> See amd-staging-drm-next:
> https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-drm-next
> which is a mirror of our main development branch or:
> https://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next-4.16-wip
> which is what is currently queued for 4.16.

Is this branch/tag stable?

How would you like to handle the merge? Should I send out patches for
you to apply and you get me a stable branch to pull into etnaviv, or
should I provide a stable branch based on the above to pull into both
amdgpu and etnaviv?

Regards,
Lucas
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-04 Thread Alex Deucher
On Fri, Dec 1, 2017 at 10:55 AM, Christian König
 wrote:
> Am 01.12.2017 um 16:28 schrieb Lucas Stach:
>>
>> Hi all,
>>
>> so this is the first step to make the marvelous AMDGPU scheduler useable
>> for other drivers. I have a (mostly) working prototype of Etnaviv using
>> the scheduler, but those patches need to keep baking for a while.
>>
>> I'm sending this out as I want to avoid rebasing this change too much
>> and don't want to take people by surprise when the Etnaviv implementation
>> surfaces. Also this might need some coordination between AMDGPU and
>> Etnaviv, which might be good to get going now.
>>
>> Please speak up now if you have any objections or comments.
>
>
> Looks good to me, but question is what is this based upon?
>
> I strongly assume drm-next, so question is now if we have any patches inside
> amd branches we should apply before doing this.

We have a bunch of changes queued up which will go usptream for 4.16.
See amd-staging-drm-next:
https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-drm-next
which is a mirror of our main development branch or:
https://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next-4.16-wip
which is what is currently queued for 4.16.

Alex

>
> CCing Andrey as well cause he has some tasks assigned around the scheduler
> as well.
>
> Regards,
> Christian.
>
>
>>
>> Regards,
>> Lucas
>>
>> Lucas Stach (2):
>>drm: move amd_gpu_scheduler into common location
>>drm/sched: move fence slab handling to module init/exit
>>
>>   drivers/gpu/drm/Kconfig|   5 +
>>   drivers/gpu/drm/Makefile   |   1 +
>>   drivers/gpu/drm/amd/amdgpu/Makefile|   5 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu.h|  16 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |   8 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c|  38 +--
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  12 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c|   8 -
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  |   4 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c|  22 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c   |  14 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h   |  12 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c  |  20 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h  |   2 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c   |   6 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c|   8 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h|   4 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c|   8 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h|   4 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c|   8 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h|   2 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c|  14 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h|   4 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |  10 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h |   4 +-
>>   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c  |   4 +-
>>   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c  |   8 +-
>>   drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c  |   8 +-
>>   drivers/gpu/drm/amd/scheduler/gpu_scheduler.h  | 185 --
>>   drivers/gpu/drm/scheduler/Makefile |   4 +
>>   .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c| 281
>> +++--
>>   drivers/gpu/drm/{amd => }/scheduler/sched_fence.c  | 122 +
>>   include/drm/gpu_scheduler.h| 171 +
>>   .../drm/gpu_scheduler_trace.h  |  14 +-
>>   34 files changed, 525 insertions(+), 511 deletions(-)
>>   delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
>>   create mode 100644 drivers/gpu/drm/scheduler/Makefile
>>   rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (64%)
>>   rename drivers/gpu/drm/{amd => }/scheduler/sched_fence.c (58%)
>>   create mode 100644 include/drm/gpu_scheduler.h
>>   rename drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h =>
>> include/drm/gpu_scheduler_trace.h (83%)
>>
>
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-04 Thread Lucas Stach
Hi,

Am Samstag, den 02.12.2017, 12:14 + schrieb Liu, Monk:
> I'm wondering if GPU reset still work after this home move ...

Why wouldn't it continue to work? After all this is just a code move
that doesn't change anything about the inner workings of the scheduler.

Regards,
Lucas

> 
> -Original Message-
> From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On
> Behalf Of Christian K?nig
> Sent: Friday, December 1, 2017 11:55 PM
> To: Lucas Stach <l.st...@pengutronix.de>; Deucher, Alexander  er.deuc...@amd.com>
> Cc: Grodzovsky, Andrey <andrey.grodzov...@amd.com>; David Airlie  l...@linux.ie>; amd-...@lists.freedesktop.org; patchwork-lst@pengutro
> nix.de; dri-devel@lists.freedesktop.org; ker...@pengutronix.de
> Subject: Re: [PATCH 0/2] Move scheduler out of AMDGPU
> 
> Am 01.12.2017 um 16:28 schrieb Lucas Stach:
> > Hi all,
> > 
> > so this is the first step to make the marvelous AMDGPU scheduler 
> > useable for other drivers. I have a (mostly) working prototype of 
> > Etnaviv using the scheduler, but those patches need to keep baking
> > for a while.
> > 
> > I'm sending this out as I want to avoid rebasing this change too
> > much 
> > and don't want to take people by surprise when the Etnaviv 
> > implementation surfaces. Also this might need some coordination 
> > between AMDGPU and Etnaviv, which might be good to get going now.
> > 
> > Please speak up now if you have any objections or comments.
> 
> Looks good to me, but question is what is this based upon?
> 
> I strongly assume drm-next, so question is now if we have any patches
> inside amd branches we should apply before doing this.
> 
> CCing Andrey as well cause he has some tasks assigned around the
> scheduler as well.
> 
> Regards,
> Christian.
> 
> > 
> > Regards,
> > Lucas
> > 
> > Lucas Stach (2):
> >    drm: move amd_gpu_scheduler into common location
> >    drm/sched: move fence slab handling to module init/exit
> > 
> >   drivers/gpu/drm/Kconfig|   5 +
> >   drivers/gpu/drm/Makefile   |   1 +
> >   drivers/gpu/drm/amd/amdgpu/Makefile|   5 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu.h|  16 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |   8 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c|  38 +--
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  12 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c|   8 -
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c|  22 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c   |  14 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h   |  12 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c  |  20 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h  |   2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c   |   6 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c|   8 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h|   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c|   8 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h|   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c|   8 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h|   2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c|  14 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h|   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |  10 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c  |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c  |   8 +-
> >   drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c  |   8 +-
> >   drivers/gpu/drm/amd/scheduler/gpu_scheduler.h  | 185 
> > --
> >   drivers/gpu/drm/scheduler/Makefile |   4 +
> >   .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c| 281
> > +++--
> >   drivers/gpu/drm/{amd => }/scheduler/sched_fence.c  | 122 +---
> > -
> >   include/drm/gpu_scheduler.h| 171
> > +
> >   .../drm/gpu_scheduler_trace.h  |  14 +-
> >   34 files changed, 525 insertions(+), 511 deletions(-)
> >   delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
> >   create mode 100644 drivers/gpu/drm/scheduler/Makefile
> >   rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (64%

RE: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-02 Thread Liu, Monk
I'm wondering if GPU reset still work after this home move ...



-Original Message-
From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On Behalf Of 
Christian K?nig
Sent: Friday, December 1, 2017 11:55 PM
To: Lucas Stach <l.st...@pengutronix.de>; Deucher, Alexander 
<alexander.deuc...@amd.com>
Cc: Grodzovsky, Andrey <andrey.grodzov...@amd.com>; David Airlie 
<airl...@linux.ie>; amd-...@lists.freedesktop.org; 
patchwork-...@pengutronix.de; dri-devel@lists.freedesktop.org; 
ker...@pengutronix.de
Subject: Re: [PATCH 0/2] Move scheduler out of AMDGPU

Am 01.12.2017 um 16:28 schrieb Lucas Stach:
> Hi all,
>
> so this is the first step to make the marvelous AMDGPU scheduler 
> useable for other drivers. I have a (mostly) working prototype of 
> Etnaviv using the scheduler, but those patches need to keep baking for a 
> while.
>
> I'm sending this out as I want to avoid rebasing this change too much 
> and don't want to take people by surprise when the Etnaviv 
> implementation surfaces. Also this might need some coordination 
> between AMDGPU and Etnaviv, which might be good to get going now.
>
> Please speak up now if you have any objections or comments.

Looks good to me, but question is what is this based upon?

I strongly assume drm-next, so question is now if we have any patches inside 
amd branches we should apply before doing this.

CCing Andrey as well cause he has some tasks assigned around the scheduler as 
well.

Regards,
Christian.

>
> Regards,
> Lucas
>
> Lucas Stach (2):
>drm: move amd_gpu_scheduler into common location
>drm/sched: move fence slab handling to module init/exit
>
>   drivers/gpu/drm/Kconfig|   5 +
>   drivers/gpu/drm/Makefile   |   1 +
>   drivers/gpu/drm/amd/amdgpu/Makefile|   5 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h|  16 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |   8 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c|  38 +--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  12 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c|   8 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  |   4 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c|  22 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c   |  14 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h   |  12 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c  |  20 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h  |   2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c   |   6 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c|   8 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h|   4 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c|   8 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h|   4 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c|   8 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h|   2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c|  14 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h|   4 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |  10 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h |   4 +-
>   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c  |   4 +-
>   drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c  |   8 +-
>   drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c  |   8 +-
>   drivers/gpu/drm/amd/scheduler/gpu_scheduler.h  | 185 --
>   drivers/gpu/drm/scheduler/Makefile |   4 +
>   .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c| 281 
> +++--
>   drivers/gpu/drm/{amd => }/scheduler/sched_fence.c  | 122 +
>   include/drm/gpu_scheduler.h| 171 +
>   .../drm/gpu_scheduler_trace.h  |  14 +-
>   34 files changed, 525 insertions(+), 511 deletions(-)
>   delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
>   create mode 100644 drivers/gpu/drm/scheduler/Makefile
>   rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (64%)
>   rename drivers/gpu/drm/{amd => }/scheduler/sched_fence.c (58%)
>   create mode 100644 include/drm/gpu_scheduler.h
>   rename drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h => 
> include/drm/gpu_scheduler_trace.h (83%)
>

___
amd-gfx mailing list
amd-...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-01 Thread Lucas Stach
Am Freitag, den 01.12.2017, 16:55 +0100 schrieb Christian König:
> Am 01.12.2017 um 16:28 schrieb Lucas Stach:
> > Hi all,
> > 
> > so this is the first step to make the marvelous AMDGPU scheduler
> > useable
> > for other drivers. I have a (mostly) working prototype of Etnaviv
> > using
> > the scheduler, but those patches need to keep baking for a while.
> > 
> > I'm sending this out as I want to avoid rebasing this change too
> > much
> > and don't want to take people by surprise when the Etnaviv
> > implementation
> > surfaces. Also this might need some coordination between AMDGPU and
> > Etnaviv, which might be good to get going now.
> > 
> > Please speak up now if you have any objections or comments.
> 
> Looks good to me, but question is what is this based upon?
> 
> I strongly assume drm-next, so question is now if we have any
> patches 
> inside amd branches we should apply before doing this.

For now this is based on 4.15-rc1, where the only difference to drm-
next in the scheduler code is currently this:

>8--

diff --git a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h 
b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
index 8bd38102b58e..283a0dc25e84 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _GPU_SCHED_TRACE_H_
 
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c 
b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index e4d3b4ec4e92..92ec663fdada 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -188,7 +188,7 @@ static bool amd_sched_entity_is_ready(struct 
amd_sched_entity *entity)
if (kfifo_is_empty(>job_queue))
return false;
 
-   if (ACCESS_ONCE(entity->dependency))
+   if (READ_ONCE(entity->dependency))
return false;
 
return true;

--->8--

I'm fine with rebasing this on whatever AMDGPU guys prefer, but this
requires a stable branch with all relevant patches included, so we can
use this as a synchronization point for the move.

> CCing Andrey as well cause he has some tasks assigned around the 
> scheduler as well.

Thanks,
Lucas
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCH 0/2] Move scheduler out of AMDGPU

2017-12-01 Thread Christian König

Am 01.12.2017 um 16:28 schrieb Lucas Stach:

Hi all,

so this is the first step to make the marvelous AMDGPU scheduler useable
for other drivers. I have a (mostly) working prototype of Etnaviv using
the scheduler, but those patches need to keep baking for a while.

I'm sending this out as I want to avoid rebasing this change too much
and don't want to take people by surprise when the Etnaviv implementation
surfaces. Also this might need some coordination between AMDGPU and
Etnaviv, which might be good to get going now.

Please speak up now if you have any objections or comments.


Looks good to me, but question is what is this based upon?

I strongly assume drm-next, so question is now if we have any patches 
inside amd branches we should apply before doing this.


CCing Andrey as well cause he has some tasks assigned around the 
scheduler as well.


Regards,
Christian.



Regards,
Lucas

Lucas Stach (2):
   drm: move amd_gpu_scheduler into common location
   drm/sched: move fence slab handling to module init/exit

  drivers/gpu/drm/Kconfig|   5 +
  drivers/gpu/drm/Makefile   |   1 +
  drivers/gpu/drm/amd/amdgpu/Makefile|   5 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu.h|  16 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c |   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c|  38 +--
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  12 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c|   8 -
  drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_job.c|  22 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c   |  14 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h   |  12 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c  |  20 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h  |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c   |   6 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c|   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h|   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c|   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h|   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c|   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h|   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c|  14 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h|   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |  10 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h |   4 +-
  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c  |   4 +-
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c  |   8 +-
  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c  |   8 +-
  drivers/gpu/drm/amd/scheduler/gpu_scheduler.h  | 185 --
  drivers/gpu/drm/scheduler/Makefile |   4 +
  .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c| 281 +++--
  drivers/gpu/drm/{amd => }/scheduler/sched_fence.c  | 122 +
  include/drm/gpu_scheduler.h| 171 +
  .../drm/gpu_scheduler_trace.h  |  14 +-
  34 files changed, 525 insertions(+), 511 deletions(-)
  delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
  create mode 100644 drivers/gpu/drm/scheduler/Makefile
  rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (64%)
  rename drivers/gpu/drm/{amd => }/scheduler/sched_fence.c (58%)
  create mode 100644 include/drm/gpu_scheduler.h
  rename drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h => 
include/drm/gpu_scheduler_trace.h (83%)



___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel