diff mbox series

drm/i915: avoid rebuilding i915_gpu_error.o on version string updates

Message ID 20181121095423.20760-1-hans.ml.holmberg@owltronix.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: avoid rebuilding i915_gpu_error.o on version string updates | expand

Commit Message

Hans Holmberg Nov. 21, 2018, 9:54 a.m. UTC
From: Hans Holmberg <hans.holmberg@cnexlabs.com>

There is no need to rebuild i915_gpu_error.o when the version string
changes as the version is available in init_utsname()->release.

Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Joonas Lahtinen Nov. 21, 2018, 12:37 p.m. UTC | #1
Quoting Hans Holmberg (2018-11-21 13:35:19)
> On Wed, Nov 21, 2018 at 11:10 AM Joonas Lahtinen
> <joonas.lahtinen@linux.intel.com> wrote:
> >
> > Quoting Hans Holmberg (2018-11-21 11:54:23)
> > > From: Hans Holmberg <hans.holmberg@cnexlabs.com>
> > >
> > > There is no need to rebuild i915_gpu_error.o when the version string
> > > changes as the version is available in init_utsname()->release.
> > >
> > > Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
> >
> > Seems reasonable to me.
> >
> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >
> > Out of curiosity, are you by any chance hashing the i915_gpu_error.o
> > file (or the contents elsewhere) for some purpose?
> 
> Oh no, I was just moderately annoyed by the file being rebuilt every
> time the version was updated(I use my current branch name as
> LOCALVERSION when building).

That's a reasonable explanation, too :)

I unblocked the message from moderation queue so that our CI picks this
up for testing. I will then proceed to merge this once the results are
back.

Thanks for the patch!

Regards, Joonas

> 
> Thanks,
> Hans
> >
> > Regards, Joonas
> >
> > > ---
> > >  drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> > > index 8762d17b6659..958e1484a3dd 100644
> > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> > > @@ -27,7 +27,7 @@
> > >   *
> > >   */
> > >
> > > -#include <generated/utsrelease.h>
> > > +#include <linux/utsname.h>
> > >  #include <linux/stop_machine.h>
> > >  #include <linux/zlib.h>
> > >  #include <drm/drm_print.h>
> > > @@ -650,7 +650,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
> > >
> > >         if (*error->error_msg)
> > >                 err_printf(m, "%s\n", error->error_msg);
> > > -       err_printf(m, "Kernel: " UTS_RELEASE "\n");
> > > +       err_printf(m, "Kernel: %s\n", init_utsname()->release);
> > >         ts = ktime_to_timespec64(error->time);
> > >         err_printf(m, "Time: %lld s %ld us\n",
> > >                    (s64)ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC);
> > > --
> > > 2.17.1
> > >
Joonas Lahtinen Nov. 22, 2018, 10:05 a.m. UTC | #2
Merged now, thanks for the patch and reviews.

Quoting Patchwork (2018-11-22 02:05:03)
> == Series Details ==
> 
> Series: drm/i915: avoid rebuilding i915_gpu_error.o on version string updates
> URL   : https://patchwork.freedesktop.org/series/52822/
> State : success
> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_5181_full -> Patchwork_10877_full =
> 
> == Summary - WARNING ==
> 
>   Minor unknown changes coming with Patchwork_10877_full need to be verified
>   manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_10877_full, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   
> 
> == Possible new issues ==
> 
>   Here are the unknown changes that may have been introduced in Patchwork_10877_full:
> 
>   === IGT changes ===
> 
>     ==== Warnings ====
> 
>     igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-blt:
>       shard-hsw:          SKIP -> PASS
> 
>     igt@perf_pmu@rc6-runtime-pm-long:
>       shard-kbl:          PASS -> SKIP +1
> 
>     igt@pm_rc6_residency@rc6-accuracy:
>       shard-kbl:          SKIP -> PASS
>       shard-snb:          PASS -> SKIP
> 
>     igt@tools_test@tools_test:
>       {shard-iclb}:       PASS -> SKIP
> 
>     
> == Known issues ==
> 
>   Here are the changes found in Patchwork_10877_full that come from known issues:
> 
>   === IGT changes ===
> 
>     ==== Issues hit ====
> 
>     igt@i915_suspend@shrink:
>       {shard-iclb}:       NOTRUN -> DMESG-WARN (fdo#108784)
> 
>     igt@kms_busy@extended-modeset-hang-newfb-render-b:
>       shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956)
> 
>     igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
>       {shard-iclb}:       NOTRUN -> DMESG-WARN (fdo#107956)
> 
>     igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
>       shard-glk:          PASS -> FAIL (fdo#108145)
> 
>     igt@kms_color@pipe-a-legacy-gamma:
>       shard-apl:          PASS -> FAIL (fdo#108145, fdo#104782)
> 
>     igt@kms_cursor_crc@cursor-128x128-suspend:
>       shard-skl:          PASS -> FAIL (fdo#103191, fdo#103232)
> 
>     igt@kms_cursor_crc@cursor-64x21-sliding:
>       {shard-iclb}:       NOTRUN -> FAIL (fdo#103232) +1
> 
>     igt@kms_cursor_crc@cursor-64x64-onscreen:
>       shard-skl:          PASS -> FAIL (fdo#103232) +1
> 
>     igt@kms_fbcon_fbt@psr-suspend:
>       {shard-iclb}:       NOTRUN -> FAIL (fdo#107882)
> 
>     igt@kms_flip@plain-flip-ts-check:
>       shard-kbl:          PASS -> DMESG-WARN (fdo#103558, fdo#103313, fdo#105602) +4
> 
>     igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
>       shard-apl:          PASS -> FAIL (fdo#103167)
> 
>     igt@kms_frontbuffer_tracking@fbc-1p-rte:
>       shard-kbl:          PASS -> DMESG-WARN (fdo#103558, fdo#103313)
> 
>     igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-wc:
>       shard-glk:          PASS -> FAIL (fdo#103167) +1
> 
>     igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc:
>       shard-skl:          PASS -> FAIL (fdo#103167) +3
> 
>     igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
>       {shard-iclb}:       PASS -> FAIL (fdo#103167) +1
> 
>     igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
>       {shard-iclb}:       PASS -> FAIL (fdo#105683)
> 
>     igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite:
>       {shard-iclb}:       NOTRUN -> FAIL (fdo#103167) +3
> 
>     igt@kms_hdmi_inject@inject-audio:
>       {shard-iclb}:       NOTRUN -> FAIL (fdo#102370)
> 
>     igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
>       shard-skl:          PASS -> INCOMPLETE (fdo#107773, fdo#104108)
> 
>     igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
>       shard-skl:          PASS -> FAIL (fdo#108145, fdo#107815)
> 
>     igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
>       shard-glk:          PASS -> FAIL (fdo#103166) +2
>       shard-apl:          PASS -> FAIL (fdo#103166)
> 
>     igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
>       {shard-iclb}:       PASS -> FAIL (fdo#103166) +2
> 
>     igt@kms_psr@no_drrs:
>       {shard-iclb}:       PASS -> FAIL (fdo#108341)
> 
>     igt@kms_sysfs_edid_timing:
>       shard-skl:          NOTRUN -> FAIL (fdo#100047)
> 
>     igt@pm_rpm@fences:
>       shard-skl:          NOTRUN -> INCOMPLETE (fdo#107807)
> 
>     igt@pm_rpm@modeset-non-lpsp-stress:
>       shard-skl:          SKIP -> INCOMPLETE (fdo#107807)
> 
>     
>     ==== Possible fixes ====
> 
>     igt@kms_atomic_transition@1x-modeset-transitions:
>       shard-hsw:          DMESG-FAIL (fdo#102614) -> PASS
> 
>     igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
>       shard-hsw:          DMESG-WARN (fdo#107956) -> PASS
> 
>     igt@kms_color@pipe-b-degamma:
>       shard-skl:          FAIL (fdo#104782) -> PASS
> 
>     igt@kms_cursor_crc@cursor-256x256-random:
>       shard-apl:          FAIL (fdo#103232) -> PASS +2
> 
>     igt@kms_cursor_crc@cursor-256x85-random:
>       shard-hsw:          DMESG-FAIL (fdo#102614, fdo#103232) -> PASS
> 
>     igt@kms_cursor_crc@cursor-64x64-suspend:
>       shard-skl:          INCOMPLETE (fdo#104108) -> PASS
> 
>     igt@kms_cursor_legacy@long-nonblocking-modeset-vs-cursor-atomic:
>       shard-hsw:          DMESG-WARN (fdo#102614) -> PASS +3
> 
>     igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
>       {shard-iclb}:       FAIL (fdo#103167) -> PASS +1
> 
>     igt@kms_plane@plane-position-covered-pipe-c-planes:
>       shard-apl:          FAIL (fdo#103166) -> PASS +1
> 
>     igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
>       shard-apl:          FAIL (fdo#108145) -> PASS
> 
>     igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
>       shard-skl:          FAIL (fdo#107815) -> PASS
> 
>     igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
>       {shard-iclb}:       FAIL (fdo#103166) -> PASS +1
> 
>     igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
>       shard-glk:          FAIL (fdo#103166) -> PASS
> 
>     igt@kms_setmode@basic:
>       shard-apl:          FAIL (fdo#99912) -> PASS
>       shard-hsw:          FAIL (fdo#99912) -> PASS
> 
>     igt@perf_pmu@init-wait-rcs0:
>       {shard-iclb}:       DMESG-WARN (fdo#108343) -> PASS
> 
>     igt@perf_pmu@rc6-runtime-pm-long:
>       shard-apl:          DMESG-WARN (fdo#103558, fdo#105602) -> SKIP
> 
>     igt@pm_rpm@modeset-lpsp:
>       shard-skl:          INCOMPLETE (fdo#107807) -> PASS
> 
>     
>     ==== Warnings ====
> 
>     igt@i915_suspend@shrink:
>       shard-skl:          INCOMPLETE (fdo#106886) -> DMESG-WARN (fdo#108784)
> 
>     
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
>   fdo#102370 https://bugs.freedesktop.org/show_bug.cgi?id=102370
>   fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
>   fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
>   fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
>   fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
>   fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
>   fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
>   fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
>   fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
>   fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
>   fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
>   fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
>   fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
>   fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
>   fdo#107882 https://bugs.freedesktop.org/show_bug.cgi?id=107882
>   fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
>   fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   fdo#108341 https://bugs.freedesktop.org/show_bug.cgi?id=108341
>   fdo#108343 https://bugs.freedesktop.org/show_bug.cgi?id=108343
>   fdo#108784 https://bugs.freedesktop.org/show_bug.cgi?id=108784
>   fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> == Participating hosts (7 -> 7) ==
> 
>   No changes in participating hosts
> 
> 
> == Build changes ==
> 
>     * Linux: CI_DRM_5181 -> Patchwork_10877
> 
>   CI_DRM_5181: 02b58f1ad4ca6ac69b69d9dbc7ee5043ebd25919 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4724: 29ae0925abe1d3a0202059538559468ad947d42d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_10877: a6ae7aabf16739513cb87f86737992801c4bc856 @ git://anongit.freedesktop.org/gfx-ci/linux
>   piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10877/shards.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 8762d17b6659..958e1484a3dd 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -27,7 +27,7 @@ 
  *
  */
 
-#include <generated/utsrelease.h>
+#include <linux/utsname.h>
 #include <linux/stop_machine.h>
 #include <linux/zlib.h>
 #include <drm/drm_print.h>
@@ -650,7 +650,7 @@  int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 
 	if (*error->error_msg)
 		err_printf(m, "%s\n", error->error_msg);
-	err_printf(m, "Kernel: " UTS_RELEASE "\n");
+	err_printf(m, "Kernel: %s\n", init_utsname()->release);
 	ts = ktime_to_timespec64(error->time);
 	err_printf(m, "Time: %lld s %ld us\n",
 		   (s64)ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC);