Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:53:40 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c drm_prime.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_panel.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bo.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem:
nouveau_nvkm_subdev_instmem_gk20a.c
Log Message:
Cleanup ifdef goo that got mangled.
Endifs without matching ifdefs and so on.
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/drm_prime.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.20 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.20 Sun Dec 19 01:03:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Sun Dec 19 01:53:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.20 2021/12/19 01:03:32 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.21 2021/12/19 01:53:39 riastradh Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes <jesse.bar...@intel.com>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.20 2021/12/19 01:03:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.21 2021/12/19 01:53:39 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -1825,8 +1825,8 @@ __drm_fb_helper_initial_config_and_unloc
fb_helper->deferred_setup = false;
- info = fb_helper->fbdev;
#ifndef __NetBSD__ /* XXX fb info */
+ info = fb_helper->fbdev;
info->var.pixclock = 0;
/* Shamelessly allow physical address leaking to userspace */
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
@@ -1841,6 +1841,7 @@ __drm_fb_helper_initial_config_and_unloc
* register the fbdev emulation instance in kernel_fb_helper_list. */
mutex_unlock(&fb_helper->lock);
+#ifndef __NetBSD__ /* XXX fb info */
ret = register_framebuffer(info);
if (ret < 0)
return ret;
Index: src/sys/external/bsd/drm2/dist/drm/drm_prime.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.11 src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/drm_prime.c:1.11 Sun Dec 19 01:16:36 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_prime.c Sun Dec 19 01:53:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_prime.c,v 1.11 2021/12/19 01:16:36 riastradh Exp $ */
+/* $NetBSD: drm_prime.c,v 1.12 2021/12/19 01:53:39 riastradh Exp $ */
/*
* Copyright © 2012 Red Hat
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.11 2021/12/19 01:16:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_prime.c,v 1.12 2021/12/19 01:53:39 riastradh Exp $");
#include <linux/export.h>
#include <linux/dma-buf.h>
@@ -418,7 +418,6 @@ void drm_prime_remove_buf_handle_locked(
} else {
rb = rb->rb_left;
}
-#endif
}
#endif
}
@@ -1180,8 +1179,8 @@ struct drm_gem_object *drm_gem_prime_imp
}
EXPORT_SYMBOL(drm_gem_prime_import);
-/**
#ifdef __NetBSD__
+/**
struct sg_table *
drm_prime_bus_dmamem_to_sg(bus_dma_tag_t dmat, const bus_dma_segment_t *segs,
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.21 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.21 Sun Dec 19 01:24:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 01:53:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.21 2021/12/19 01:24:25 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.22 2021/12/19 01:53:39 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.21 2021/12/19 01:24:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.22 2021/12/19 01:53:39 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1967,7 +1967,6 @@ int i915_drm_resume_early(struct drm_dev
struct pci_dev *pdev = dev_priv->drm.pdev;
int ret;
-#ifndef __NetBSD__ /* pmf handles this for us. */
/*
* We have a resume ordering issue with the snd-hda driver also
* requiring our device to be power up. Due to the lack of a
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.2 Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c Sun Dec 19 01:53:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_panel.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $ */
+/* $NetBSD: intel_panel.c,v 1.3 2021/12/19 01:53:39 riastradh Exp $ */
/*
* Copyright © 2006-2010 Intel Corporation
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.3 2021/12/19 01:53:39 riastradh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -699,7 +699,6 @@ intel_panel_actually_set_backlight(const
level = intel_panel_compute_brightness(connector, level);
panel->backlight.set(conn_state, level);
}
-#endif
/* set backlight brightness to level in range [0..max], assuming hw min is
* respected.
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.16 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c:1.16 Sat Dec 18 23:45:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Sun Dec 19 01:53:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bo.c,v 1.16 2021/12/18 23:45:32 riastradh Exp $ */
+/* $NetBSD: nouveau_bo.c,v 1.17 2021/12/19 01:53:39 riastradh Exp $ */
/*
* Copyright 2007 Dave Airlied
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.16 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.17 2021/12/19 01:53:39 riastradh Exp $");
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
@@ -1739,7 +1739,6 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
ttm_dma->dma_address[i] = addr;
}
return 0;
-#endif
}
static void
@@ -1749,7 +1748,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
struct nouveau_drm *drm;
struct device *dev;
unsigned i;
-#endif
bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
if (slave)
@@ -1784,7 +1782,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
}
ttm_pool_unpopulate(ttm);
-#endif
}
#ifdef __NetBSD__
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c:1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c:1.5 Sat Dec 18 23:45:40 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c Sun Dec 19 01:53:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_instmem_gk20a.c,v 1.5 2021/12/18 23:45:40 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_instmem_gk20a.c,v 1.6 2021/12/19 01:53:40 riastradh Exp $ */
/*
* Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
@@ -44,7 +44,7 @@
* goes beyond a certain threshold. At the moment this limit is 1MB.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_gk20a.c,v 1.5 2021/12/18 23:45:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_gk20a.c,v 1.6 2021/12/19 01:53:40 riastradh Exp $");
#include "priv.h"
@@ -184,7 +184,6 @@ gk20a_instobj_iommu_recycle_vaddr(struct
imem->vaddr_max);
}
-#endif /* __NetBSD__ */
/*
* Must be called while holding gk20a_instmem::lock
