diff options
| author | riastradh <riastradh@NetBSD.org> | 2020-02-14 04:37:09 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2020-02-14 04:37:09 +0000 |
| commit | 1272ac9c74fa85331ab0308ecfa99c1f7b480010 (patch) | |
| tree | 65269b211f8bc1ace6ac5ee7bb4fb0d251c2b9bf /sys | |
| parent | 657463e36886295dbe41de2a0b8c8cd9f78736ff (diff) | |
Stub out console_lock/unlock and drm_fb_helper_set_suspend.
Reduce some more diffs.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c | 12 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c | 6 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/drm_fb_helper.c | 10 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/i915/i915_drv.c | 8 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c | 8 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c | 10 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c | 10 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/include/linux/console.h | 12 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/include/linux/fb.h | 5 |
9 files changed, 38 insertions, 43 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c index 100661fd42c..aad654d91fe 100644 --- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c +++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_device.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: amdgpu_device.c,v 1.6 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. @@ -28,7 +28,7 @@ * Jerome Glisse */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.6 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/console.h> #include <linux/slab.h> @@ -1893,13 +1893,11 @@ int amdgpu_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) } #endif -#ifndef __NetBSD__ /* XXX amdgpu fb */ if (fbcon) { console_lock(); amdgpu_fbdev_set_suspend(adev, 1); console_unlock(); } -#endif return 0; } @@ -1922,11 +1920,9 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; -#ifndef __NetBSD__ /* XXX amdgpu fb */ if (fbcon) { console_lock(); } -#endif #ifndef __NetBSD__ /* pmf handles this for us. */ if (resume) { pci_set_power_state(dev->pdev, PCI_D0); @@ -1957,10 +1953,8 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) r = amdgpu_late_init(adev); if (r) { -#ifndef __NetBSD__ if (fbcon) console_unlock(); -#endif return r; } @@ -2012,12 +2006,10 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) dev->dev->power.disable_depth--; #endif -#ifndef __NetBSD__ /* XXX amdgpu fb */ if (fbcon) { amdgpu_fbdev_set_suspend(adev, 0); console_unlock(); } -#endif return 0; } diff --git a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c index 21f9171f439..32b24802206 100644 --- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c +++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_fb.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: amdgpu_fb.c,v 1.5 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright © 2007 David Airlie @@ -26,7 +26,7 @@ * David Airlie */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.4 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.5 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/module.h> #include <linux/slab.h> @@ -438,11 +438,9 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev) void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state) { -#ifndef __NetBSD__ /* XXX amdgpu fb suspend */ if (adev->mode_info.rfbdev) drm_fb_helper_set_suspend(&adev->mode_info.rfbdev->helper, state); -#endif } int amdgpu_fbdev_total_size(struct amdgpu_device *adev) diff --git a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c index 346289d9878..6685be44cad 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c @@ -1,4 +1,4 @@ -/* $NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $ */ +/* $NetBSD: drm_fb_helper.c,v 1.14 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright (c) 2006-2009 Red Hat Inc. @@ -30,7 +30,7 @@ * Jesse Barnes <jesse.barnes@intel.com> */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.14 2020/02/14 04:37:09 riastradh Exp $"); #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -864,7 +864,11 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) } EXPORT_SYMBOL(drm_fb_helper_fini); -#ifndef __NetBSD__ /* XXX fb info */ +#ifdef __NetBSD__ /* XXX fb info */ +void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, int state) +{ +} +#else /** * drm_fb_helper_unlink_fbi - wrapper around unlink_framebuffer * @fb_helper: driver-allocated fbdev helper diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c index 7e600c9b84c..c133088fd8d 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $NetBSD: i915_drv.c,v 1.17 2019/12/05 20:03:09 maya Exp $ */ +/* $NetBSD: i915_drv.c,v 1.18 2020/02/14 04:37:09 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.17 2019/12/05 20:03:09 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.18 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/device.h> #include <linux/acpi.h> @@ -741,9 +741,7 @@ int i915_drm_suspend(struct drm_device *dev) intel_uncore_forcewake_reset(dev, false); intel_opregion_fini(dev); -#ifndef __NetBSD__ /* XXX fb */ intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true); -#endif dev_priv->suspend_count++; @@ -870,9 +868,7 @@ int i915_drm_resume(struct drm_device *dev) intel_opregion_init(dev); -#ifndef __NetBSD__ /* XXX fb */ intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false); -#endif mutex_lock(&dev_priv->modeset_restore_lock); dev_priv->modeset_restore = MODESET_DONE; diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c index b7fe0908570..053b54adc8d 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: intel_fbdev.c,v 1.9 2018/08/27 07:55:39 riastradh Exp $ */ +/* $NetBSD: intel_fbdev.c,v 1.10 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright © 2007 David Airlie @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.9 2018/08/27 07:55:39 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.10 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/async.h> #include <linux/module.h> @@ -790,9 +790,9 @@ void intel_fbdev_fini(struct drm_device *dev) dev_priv->fbdev = NULL; } -#ifndef __NetBSD__ /* XXX fb suspend */ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous) { +#ifndef __NetBSD__ /* XXX fb suspend */ struct drm_i915_private *dev_priv = dev->dev_private; struct intel_fbdev *ifbdev = dev_priv->fbdev; struct fb_info *info; @@ -838,8 +838,8 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous drm_fb_helper_set_suspend(&ifbdev->helper, state); console_unlock(); -} #endif +} void intel_fbdev_output_poll_changed(struct drm_device *dev) { diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c index cfc772a40f4..8fdde373805 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_fbcon.c,v 1.8 2020/02/12 20:31:46 jdolecek Exp $ */ +/* $NetBSD: nouveau_fbcon.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright © 2007 David Airlie @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.8 2020/02/12 20:31:46 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/module.h> #include <linux/kernel.h> @@ -273,11 +273,11 @@ nouveau_fbcon_accel_fini(struct drm_device *dev) struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_fbdev *fbcon = drm->fbcon; if (fbcon && drm->channel) { -#ifndef __NetBSD__ /* XXX nouveau fbaccel */ console_lock(); +#ifndef __NetBSD__ /* XXX nouveau fbaccel */ fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED; - console_unlock(); #endif + console_unlock(); nouveau_channel_idle(drm->channel); nvif_object_fini(&fbcon->twod); nvif_object_fini(&fbcon->blit); @@ -585,7 +585,6 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state) { struct nouveau_drm *drm = nouveau_drm(dev); if (drm->fbcon) { -#ifndef __NetBSD__ console_lock(); if (state == FBINFO_STATE_RUNNING) nouveau_fbcon_accel_restore(dev); @@ -593,7 +592,6 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state) if (state != FBINFO_STATE_RUNNING) nouveau_fbcon_accel_save_disable(dev); console_unlock(); -#endif } } diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c index fade379c941..fe9fc3c11c8 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c @@ -1,4 +1,4 @@ -/* $NetBSD: radeon_device.c,v 1.8 2020/02/14 04:35:20 riastradh Exp $ */ +/* $NetBSD: radeon_device.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. @@ -28,7 +28,7 @@ * Jerome Glisse */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.8 2020/02/14 04:35:20 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.9 2020/02/14 04:37:09 riastradh Exp $"); #include <linux/console.h> #include <linux/slab.h> @@ -1844,13 +1844,11 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) } #endif -#ifndef __NetBSD__ /* XXX radeon fb */ if (fbcon) { console_lock(); radeon_fbdev_set_suspend(rdev, 1); console_unlock(); } -#endif return 0; } @@ -1873,11 +1871,9 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; -#ifndef __NetBSD__ /* XXX radeon fb */ if (fbcon) { console_lock(); } -#endif #ifndef __NetBSD__ /* pmf handles this for us. */ if (resume) { pci_set_power_state(dev->pdev, PCI_D0); @@ -1963,12 +1959,10 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled) radeon_pm_compute_clocks(rdev); -#ifndef __NetBSD__ /* XXX radeon fb */ if (fbcon) { radeon_fbdev_set_suspend(rdev, 0); console_unlock(); } -#endif return 0; } diff --git a/sys/external/bsd/drm2/include/linux/console.h b/sys/external/bsd/drm2/include/linux/console.h index 95ab1f2e5f8..2e40314b209 100644 --- a/sys/external/bsd/drm2/include/linux/console.h +++ b/sys/external/bsd/drm2/include/linux/console.h @@ -1,4 +1,4 @@ -/* $NetBSD: console.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */ +/* $NetBSD: console.h,v 1.3 2020/02/14 04:37:10 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -32,4 +32,14 @@ #ifndef _LINUX_CONSOLE_H_ #define _LINUX_CONSOLE_H_ +static inline void +console_lock(void) +{ +} + +static inline void +console_unlock(void) +{ +} + #endif /* _LINUX_CONSOLE_H_ */ diff --git a/sys/external/bsd/drm2/include/linux/fb.h b/sys/external/bsd/drm2/include/linux/fb.h index 007cabd24b4..5e04e2ec5a2 100644 --- a/sys/external/bsd/drm2/include/linux/fb.h +++ b/sys/external/bsd/drm2/include/linux/fb.h @@ -1,4 +1,4 @@ -/* $NetBSD: fb.h,v 1.3 2018/08/27 06:06:41 riastradh Exp $ */ +/* $NetBSD: fb.h,v 1.4 2020/02/14 04:37:10 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -38,4 +38,7 @@ #define PICOS2KHZ(PICOS) (1000000000ul / (PICOS)) #define KHZ2PICOS(KHZ) (1000000000ul / (KHZ)) +#define FBINFO_STATE_RUNNING 0 +#define FBINFO_STATE_SUSPENDED 1 + #endif /* _LINUX_FB_H_ */ |
