| Message ID | 20190630061922.7254-26-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: drop use of drmp.h in drm-misc | expand |
Am 30.06.19 um 08:19 schrieb Sam Ravnborg: > Drop use of the deprecated drmP.h header file. > Fix fallout. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: Huang Rui <ray.huang@amd.com> > Cc: Eric Anholt <eric@anholt.net> > Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> > Cc: Sharat Masetty <smasetty@codeaurora.org> > Cc: Nathan Chancellor <natechancellor@gmail.com> > Cc: Nayan Deshmukh <nayan26deshmukh@gmail.com> > Cc: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > The list of cc: was too large to add all recipients to the cover letter. > Please find cover letter here: > https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html > Search for "drm: drop use of drmp.h in drm-misc" > > Sam > > drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 -- > drivers/gpu/drm/scheduler/sched_entity.c | 3 +++ > drivers/gpu/drm/scheduler/sched_fence.c | 6 ++++-- > drivers/gpu/drm/scheduler/sched_main.c | 3 ++- > 4 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > index 1626f3967130..d79086498aff 100644 > --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > @@ -28,8 +28,6 @@ > #include <linux/types.h> > #include <linux/tracepoint.h> > > -#include <drm/drmP.h> > - > #undef TRACE_SYSTEM > #define TRACE_SYSTEM gpu_scheduler > #define TRACE_INCLUDE_FILE gpu_scheduler_trace > diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c > index 35ddbec1375a..d5a6a946f486 100644 > --- a/drivers/gpu/drm/scheduler/sched_entity.c > +++ b/drivers/gpu/drm/scheduler/sched_entity.c > @@ -22,6 +22,9 @@ > */ > > #include <linux/kthread.h> > +#include <linux/slab.h> > + > +#include <drm/drm_print.h> > #include <drm/gpu_scheduler.h> > > #include "gpu_scheduler_trace.h" > diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c > index d8d2dff9ea2f..54977408f574 100644 > --- a/drivers/gpu/drm/scheduler/sched_fence.c > +++ b/drivers/gpu/drm/scheduler/sched_fence.c > @@ -22,9 +22,11 @@ > */ > > #include <linux/kthread.h> > -#include <linux/wait.h> > +#include <linux/module.h> > #include <linux/sched.h> > -#include <drm/drmP.h> > +#include <linux/slab.h> > +#include <linux/wait.h> > + > #include <drm/gpu_scheduler.h> > > static struct kmem_cache *sched_fence_slab; > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > index c1058eece16b..9a0ee74d82dc 100644 > --- a/drivers/gpu/drm/scheduler/sched_main.c > +++ b/drivers/gpu/drm/scheduler/sched_main.c > @@ -48,7 +48,8 @@ > #include <linux/wait.h> > #include <linux/sched.h> > #include <uapi/linux/sched/types.h> > -#include <drm/drmP.h> > + > +#include <drm/drm_print.h> > #include <drm/gpu_scheduler.h> > #include <drm/spsc_queue.h> >
On Sun, Jun 30, 2019 at 12:08:26PM +0000, Koenig, Christian wrote: > Am 30.06.19 um 08:19 schrieb Sam Ravnborg: > > Drop use of the deprecated drmP.h header file. > > Fix fallout. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Alex Deucher <alexander.deucher@amd.com> > > Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > > Cc: "Christian König" <christian.koenig@amd.com> > > Cc: Huang Rui <ray.huang@amd.com> > > Cc: Eric Anholt <eric@anholt.net> > > Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> > > Cc: Sharat Masetty <smasetty@codeaurora.org> > > Cc: Nathan Chancellor <natechancellor@gmail.com> > > Cc: Nayan Deshmukh <nayan26deshmukh@gmail.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Reviewed-by: Christian König <christian.koenig@amd.com> Thanks, applied. Sam
diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 1626f3967130..d79086498aff 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -28,8 +28,6 @@ #include <linux/types.h> #include <linux/tracepoint.h> -#include <drm/drmP.h> - #undef TRACE_SYSTEM #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 35ddbec1375a..d5a6a946f486 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -22,6 +22,9 @@ */ #include <linux/kthread.h> +#include <linux/slab.h> + +#include <drm/drm_print.h> #include <drm/gpu_scheduler.h> #include "gpu_scheduler_trace.h" diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c index d8d2dff9ea2f..54977408f574 100644 --- a/drivers/gpu/drm/scheduler/sched_fence.c +++ b/drivers/gpu/drm/scheduler/sched_fence.c @@ -22,9 +22,11 @@ */ #include <linux/kthread.h> -#include <linux/wait.h> +#include <linux/module.h> #include <linux/sched.h> -#include <drm/drmP.h> +#include <linux/slab.h> +#include <linux/wait.h> + #include <drm/gpu_scheduler.h> static struct kmem_cache *sched_fence_slab; diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index c1058eece16b..9a0ee74d82dc 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -48,7 +48,8 @@ #include <linux/wait.h> #include <linux/sched.h> #include <uapi/linux/sched/types.h> -#include <drm/drmP.h> + +#include <drm/drm_print.h> #include <drm/gpu_scheduler.h> #include <drm/spsc_queue.h>
Drop use of the deprecated drmP.h header file. Fix fallout. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: Huang Rui <ray.huang@amd.com> Cc: Eric Anholt <eric@anholt.net> Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Cc: Sharat Masetty <smasetty@codeaurora.org> Cc: Nathan Chancellor <natechancellor@gmail.com> Cc: Nayan Deshmukh <nayan26deshmukh@gmail.com> Cc: Sam Ravnborg <sam@ravnborg.org> --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 -- drivers/gpu/drm/scheduler/sched_entity.c | 3 +++ drivers/gpu/drm/scheduler/sched_fence.c | 6 ++++-- drivers/gpu/drm/scheduler/sched_main.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-)