Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/i915drm i915: Remove spurious local i9...



details:   https://anonhg.NetBSD.org/src/rev/beac96f047c6
branches:  trunk
changeset: 368532:beac96f047c6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Jul 17 14:10:32 2022 +0000

description:
i915: Remove spurious local i915_perf.c override.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms |   3 +-
 sys/external/bsd/drm2/i915drm/i915_perf.c      |  45 --------------------------
 2 files changed, 1 insertions(+), 47 deletions(-)

diffs (66 lines):

diff -r a7bd30716126 -r beac96f047c6 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Jul 17 13:38:06 2022 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Jul 17 14:10:32 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.86 2022/02/27 21:22:01 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.87 2022/07/17 14:10:32 riastradh Exp $
 
 version        20180827
 
@@ -66,7 +66,6 @@
 # Local overrides
 file   external/bsd/drm2/i915drm/i915_gem_userptr.c    i915drmkms
 file   external/bsd/drm2/i915drm/i915_gemfs.c  i915drmkms
-file   external/bsd/drm2/i915drm/i915_perf.c   i915drmkms
 file   external/bsd/drm2/i915drm/i915_switcheroo.c     i915drmkms
 file   external/bsd/drm2/i915drm/i915_sysfs.c  i915drmkms
 file   external/bsd/drm2/i915drm/i915_trace_points.c   i915drmkms
diff -r a7bd30716126 -r beac96f047c6 sys/external/bsd/drm2/i915drm/i915_perf.c
--- a/sys/external/bsd/drm2/i915drm/i915_perf.c Sun Jul 17 13:38:06 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*     $NetBSD: i915_perf.c,v 1.2 2021/12/19 01:44:10 riastradh Exp $  */
-
-/*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Taylor R. Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_perf.c,v 1.2 2021/12/19 01:44:10 riastradh Exp $");
-
-#include "i915_drv.h"
-
-void
-i915_perf_init(struct drm_i915_private *i915)
-{
-}
-
-void
-i915_perf_fini(struct drm_i915_private *i915)
-{
-}



Home | Main Index | Thread Index | Old Index