| Message ID | 20250327232629.2939-1-andi.shyti@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/gem: Convert SPDX headers to single-line format | expand |
Hi Andi, > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Andi Shyti > Sent: Friday, March 28, 2025 4:56 AM > To: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri- > devel@lists.freedesktop.org> > Cc: Tvrtko Ursulin <tursulin@ursulin.net>; Joonas Lahtinen > <joonas.lahtinen@linux.intel.com>; Andi Shyti <andi.shyti@linux.intel.com>; Andi > Shyti <andi.shyti@kernel.org> > Subject: [PATCH] drm/i915/gem: Convert SPDX headers to single-line format > > Replace multi-line SPDX license headers with single-line equivalents (// SPDX- > License-Identifier: MIT or /* ... */ for headers), as preferred by current kernel > coding style. > > Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_busy.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_clflush.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_context.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_internal.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_mman.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + > drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 5 ++--- > drivers/gpu/drm/i915/gem/i915_gem_wait.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gemfs.h | 3 +-- > 29 files changed, 30 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_busy.c > b/drivers/gpu/drm/i915/gem/i915_gem_busy.c > index ddda468241ef..6e4d0ce3952f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_busy.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_busy.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > index 7d97ea2a653e..c4854c5b4e0f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.h > b/drivers/gpu/drm/i915/gem/i915_gem_clflush.h > index e6c382973129..9d7ee1579900 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c > b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index ab1af978911b..15835952352e 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2011-2012 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h > b/drivers/gpu/drm/i915/gem/i915_gem_context.h > index e5b0f66ea1fe..6e682a6a0574 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > index 67ac2586a0f3..0267c924634b 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2019 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > index 9473050ac842..05e440643aa2 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright 2012 Red Hat Inc > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c > b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > index 75a143d996e0..7a0cc51923b3 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 7796c4119ef5..ca7e9216934a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2008,2010 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.c > b/drivers/gpu/drm/i915/gem/i915_gem_internal.c > index ea7561ae6e13..232b984f60b6 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_internal.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_internal.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h > b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h > index 28d6526e32ab..8044d34707b6 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2019 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c > b/drivers/gpu/drm/i915/gem/i915_gem_mman.c > index c3dabb857960..f6d37dff320d 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.h > b/drivers/gpu/drm/i915/gem/i915_gem_mman.h > index 196417fd0f5c..946fb9825eb3 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2019 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c > b/drivers/gpu/drm/i915/gem/i915_gem_object.c > index 356530b599ce..1f38e367c60b 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: MIT > /* > * Copyright © 2017 Intel Corporation > * > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h > b/drivers/gpu/drm/i915/gem/i915_gem_object.h > index a5f34542135c..c34f41605b46 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > index 68413c05c812..64600aa8227f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > index 8780aa243105..7f83f8bdc8fb 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c > b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > index ef85c6dc9fd5..f9e7cab140f8 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c > b/drivers/gpu/drm/i915/gem/i915_gem_pm.c > index 900c08337942..f0857c5c96df 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2019 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.h > b/drivers/gpu/drm/i915/gem/i915_gem_pm.h > index bedf1e95941a..bd5bd2c5e7f9 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2019 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > index ae3343c81a64..3b81cc3ad5be 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c > b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c > index aec41f0f098f..b81e67504bbe 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2008-2015 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > index 9d958a6f377e..3380151edfc1 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2008-2012 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_throttle.c > b/drivers/gpu/drm/i915/gem/i915_gem_throttle.c > index af85d0c28168..8814cbcde5b5 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_throttle.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_throttle.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2014-2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c > b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c > index 5ac23ff3feff..5a296ba3758a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2008 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > index 09b68713ab32..307a18eede72 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2012-2014 Intel Corporation > * > - * Based on amdgpu_mn, which bears the following notice: > + * Based on amdgpu_mn, which bears the following notice: > * > * Copyright 2014 Advanced Micro Devices, Inc. > * All Rights Reserved. > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c > b/drivers/gpu/drm/i915/gem/i915_gem_wait.c > index 1f55e62044a4..7127e90c1a8f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2016 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c > b/drivers/gpu/drm/i915/gem/i915_gemfs.c > index 46b9a17d6abc..65d84a93c525 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gemfs.c > +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: MIT > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2017 Intel Corporation > */ > > diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.h > b/drivers/gpu/drm/i915/gem/i915_gemfs.h > index 5d835e44c4f6..16d4333c9a4e 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gemfs.h > +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.h > @@ -1,6 +1,5 @@ > +/* SPDX-License-Identifier: MIT */ > /* > - * SPDX-License-Identifier: MIT > - * > * Copyright © 2017 Intel Corporation > */ > > -- > 2.47.2 Looks good to me. Reviewed-by: Nitin Gote <nitin.r.gote@intel.com> - Nitin
On Fri, 28 Mar 2025, Andi Shyti <andi.shyti@linux.intel.com> wrote: > Replace multi-line SPDX license headers with single-line > equivalents (// SPDX-License-Identifier: MIT or /* ... */ for > headers), as preferred by current kernel coding style. > > Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_busy.c b/drivers/gpu/drm/i915/gem/i915_gem_busy.c index ddda468241ef..6e4d0ce3952f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_busy.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_busy.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c index 7d97ea2a653e..c4854c5b4e0f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.h b/drivers/gpu/drm/i915/gem/i915_gem_clflush.h index e6c382973129..9d7ee1579900 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index ab1af978911b..15835952352e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2011-2012 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h index e5b0f66ea1fe..6e682a6a0574 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h index 67ac2586a0f3..0267c924634b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2019 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index 9473050ac842..05e440643aa2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright 2012 Red Hat Inc */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c index 75a143d996e0..7a0cc51923b3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 7796c4119ef5..ca7e9216934a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2008,2010 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.c b/drivers/gpu/drm/i915/gem/i915_gem_internal.c index ea7561ae6e13..232b984f60b6 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_internal.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_internal.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h index 28d6526e32ab..8044d34707b6 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2019 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c index c3dabb857960..f6d37dff320d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.h b/drivers/gpu/drm/i915/gem/i915_gem_mman.h index 196417fd0f5c..946fb9825eb3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2019 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 356530b599ce..1f38e367c60b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT /* * Copyright © 2017 Intel Corporation * diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index a5f34542135c..c34f41605b46 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index 68413c05c812..64600aa8227f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index 8780aa243105..7f83f8bdc8fb 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index ef85c6dc9fd5..f9e7cab140f8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c index 900c08337942..f0857c5c96df 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2019 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.h b/drivers/gpu/drm/i915/gem/i915_gem_pm.h index bedf1e95941a..bd5bd2c5e7f9 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2019 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index ae3343c81a64..3b81cc3ad5be 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c index aec41f0f098f..b81e67504bbe 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2008-2015 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index 9d958a6f377e..3380151edfc1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2008-2012 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_throttle.c b/drivers/gpu/drm/i915/gem/i915_gem_throttle.c index af85d0c28168..8814cbcde5b5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_throttle.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_throttle.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2014-2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c index 5ac23ff3feff..5a296ba3758a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_tiling.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2008 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 09b68713ab32..307a18eede72 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2012-2014 Intel Corporation * - * Based on amdgpu_mn, which bears the following notice: + * Based on amdgpu_mn, which bears the following notice: * * Copyright 2014 Advanced Micro Devices, Inc. * All Rights Reserved. diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c index 1f55e62044a4..7127e90c1a8f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2016 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c index 46b9a17d6abc..65d84a93c525 100644 --- a/drivers/gpu/drm/i915/gem/i915_gemfs.c +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: MIT /* - * SPDX-License-Identifier: MIT - * * Copyright © 2017 Intel Corporation */ diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.h b/drivers/gpu/drm/i915/gem/i915_gemfs.h index 5d835e44c4f6..16d4333c9a4e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gemfs.h +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.h @@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: MIT */ /* - * SPDX-License-Identifier: MIT - * * Copyright © 2017 Intel Corporation */
Replace multi-line SPDX license headers with single-line equivalents (// SPDX-License-Identifier: MIT or /* ... */ for headers), as preferred by current kernel coding style. Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_busy.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_clflush.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_context.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_context.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 5 ++--- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gemfs.h | 3 +-- 29 files changed, 30 insertions(+), 57 deletions(-)