sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (9e747f2484aec788b3b5ce31e156bd41ff4bb2fe)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (9e747f2484aec788b3b5ce31e156bd41ff4bb2fe)
Date: Sun, 9 Feb 2020 12:55:59 +0000

GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

z-kernels/nvidia_driver/DETAILS |
4
z-kernels/nvidia_driver/HISTORY |
5
z-kernels/nvidia_driver/PRE_BUILD |
6
z-kernels/nvidia_driver/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch |
412 ----------
4 files changed, 8 insertions(+), 419 deletions(-)

New commits:
commit 9e747f2484aec788b3b5ce31e156bd41ff4bb2fe
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: version 440.59

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 885d0da..2207f08 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,6 +1,6 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
- STABLE_VERSION=440.44
+ STABLE_VERSION=440.59
BETA_VERSION=415.27
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
@@ -9,7 +9,7 @@ if [[ $NVIDIA_BETA == y ]]; then

SOURCE_HASH=sha512:5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b
+
SOURCE_HASH=sha512:2e9029bc7c93a99eac7d3a5ca1f21da799da442a70b1708d2db734956f77dd1a1eb300f947b8ab46ff9113048cd63ca57924caa912a3ea6c3d678425182b9711
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index ff47520..59678f1 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,8 @@
+2020-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 440.59
+ * xf86-video-nvidia-0000-fix-for-kernel-5.5.patch, PRE_BUILD: remove
+ obsolete patch
+
2020-01-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, xf86-video-nvidia-0000-fix-for-kernel-5.5.patch: fix
build
against linux 5.5
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index f769cc5..f98e943 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -16,9 +16,5 @@ sedit 's/__.*__\///' nvidia-settings.desktop &&
# than the running kernel
#
cd $SOURCE_DIRECTORY/kernel &&
-sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile &&
-
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 <
"$SPELL_DIRECTORY/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch"
+sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile

diff --git
a/z-kernels/nvidia_driver/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
b/z-kernels/nvidia_driver/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
deleted file mode 100644
index 2cd11ce..0000000
--- a/z-kernels/nvidia_driver/xf86-video-nvidia-0000-fix-for-kernel-5.5.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From 237dbf195aa9e0341579821fcbcca1947040582c Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github AT nmacleod.com>
-Date: Tue, 24 Dec 2019 02:38:46 +0000
-Subject: [PATCH] Fix for kernel 5.5-rc
-
-Credit:
https://devtalk.nvidia.com/default/topic/1068332/linux/nvidia-driver-does-not-build-on-linux-v5-5-release-candidate-kernel/post/5411562/#5411562
----
- kernel/common/inc/nv-drm.h | 36 +++++++++++++++++++++
- kernel/conftest.sh | 31 ++++++++++++++++++
- kernel/nvidia-drm/nvidia-drm-connector.c | 14 ++++++++
- kernel/nvidia-drm/nvidia-drm-connector.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-crtc.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-drv.c | 2 +-
- kernel/nvidia-drm/nvidia-drm-encoder.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-fb.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-gem.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-helper.c | 2 +-
- kernel/nvidia-drm/nvidia-drm-helper.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-modeset.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-os-interface.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-prime-fence.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-priv.h | 2 +-
- kernel/nvidia-drm/nvidia-drm-utils.h | 2 +-
- 16 files changed, 94 insertions(+), 13 deletions(-)
- create mode 100644 kernel/common/inc/nv-drm.h
-
-diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
-new file mode 100644
-index 0000000..07e9f3c
---- /dev/null
-+++ b/kernel/common/inc/nv-drm.h
-@@ -0,0 +1,36 @@
-+#ifndef _NV_DRM_H_
-+#define _NV_DRM_H_
-+
-+#include "conftest.h"
-+
-+#if defined(NV_DRM_DRMP_H_PRESENT)
-+#include <drm/drmP.h>
-+#else
-+#include <linux/agp_backend.h>
-+#include <linux/file.h>
-+#include <linux/init.h>
-+#include <linux/jiffies.h>
-+#include <linux/kernel.h>
-+#include <linux/mutex.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <asm/pgalloc.h>
-+#include <linux/uaccess.h>
-+
-+#include <uapi/drm/drm.h>
-+#include <uapi/drm/drm_mode.h>
-+
-+#include <drm/drm_agpsupport.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_prime.h>
-+#include <drm/drm_pci.h>
-+#include <drm/drm_ioctl.h>
-+#include <drm/drm_sysfs.h>
-+#include <drm/drm_vblank.h>
-+#include <drm/drm_device.h>
-+
-+#include <drm/drm_gem.h>
-+#endif
-+
-+#endif
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index c9c2db3..dd22bb0 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1150,6 +1150,9 @@ compile_test() {
- CODE="
- #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_drv.h>
-+ #include <drm/drm_prime.h>
- #endif
- #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
- #error DRM not enabled
-@@ -1781,6 +1784,8 @@ compile_test() {
- echo "$CONFTEST_PREAMBLE
- #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_drv.h>
- #endif
- #include <drm/drm_atomic.h>
- #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
-@@ -1909,7 +1914,11 @@ compile_test() {
- # attached drivers") in v3.14 (2013-12-11)
- #
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_drv.h>
-+ #endif
- int conftest_drm_driver_has_legacy_dev_list(void) {
- return offsetof(struct drm_driver, legacy_dev_list);
- }"
-@@ -1933,7 +1942,11 @@ compile_test() {
- # 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814
- #
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_crtc.h>
-+ #endif
-
- int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
- return
-@@ -1949,7 +1962,11 @@ compile_test() {
- compile_check_conftest "$CODE"
"NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
-
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_encoder.h>
-+ #endif
-
- int conftest_drm_encoder_init_has_name_arg(void) {
- return
-@@ -1964,7 +1981,11 @@ compile_test() {
- compile_check_conftest "$CODE"
"NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
-
- echo "$CONFTEST_PREAMBLE
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_plane.h>
-+ #endif
-
- int
conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
- return
-@@ -1991,7 +2012,11 @@ compile_test() {
- echo "#undef
NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest
"types"
-
- echo "$CONFTEST_PREAMBLE
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #else
-+ #include <drm/drm_plane.h>
-+ #endif
-
- int conftest_drm_universal_plane_init_has_name_arg(void) {
- return
-@@ -3084,7 +3109,9 @@ compile_test() {
- # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
- #
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #endif
- #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
- #include <drm/drm_framebuffer.h>
- #endif
-@@ -3103,7 +3130,9 @@ compile_test() {
- # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
- #
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #endif
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
- #endif
-@@ -3122,7 +3151,9 @@ compile_test() {
- # functions") in v4.15 (2017-09-26).
- #
- CODE="
-+ #if defined(NV_DRM_DRMP_H_PRESENT)
- #include <drm/drmP.h>
-+ #endif
- #if defined(NV_DRM_DRM_DRV_H_PRESENT)
- #include <drm/drm_drv.h>
- #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c
b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 1553ebc..f851561 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -20,6 +20,8 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
-+#include <linux/version.h>
-+
- #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -71,7 +73,11 @@ static enum drm_connector_status
__nv_drm_connector_detect_internal(
- struct nv_drm_encoder *nv_detected_encoder = NULL;
-
- struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
- unsigned int i;
-+#else
-+ struct drm_encoder *encoder = NULL;
-+#endif
-
- BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
-
-@@ -87,11 +93,16 @@ static enum drm_connector_status
__nv_drm_connector_detect_internal(
- goto done;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
- for (i = 0;
- i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
- struct drm_encoder *encoder;
-+#else
-+ drm_connector_for_each_possible_encoder(connector, encoder) {
-+#endif
- struct nv_drm_encoder *nv_encoder;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
- if (connector->encoder_ids[i] == 0) {
- break;
- }
-@@ -102,6 +113,7 @@ static enum drm_connector_status
__nv_drm_connector_detect_internal(
- BUG_ON(encoder != NULL);
- continue;
- }
-+#endif
-
- /*
- * DVI-I connectors can drive both digital and analog
-@@ -169,6 +181,8 @@ static enum drm_connector_status
__nv_drm_connector_detect_internal(
- }
-
- detected_encoder = encoder;
-+
-+ break;
- }
- }
-
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h
b/kernel/nvidia-drm/nvidia-drm-connector.h
-index f74e22c..099390d 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.h
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- #include "nvtypes.h"
- #include "nvkms-api-types.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h
b/kernel/nvidia-drm/nvidia-drm-crtc.h
-index 31ef3b5..5de3a51 100644
---- a/kernel/nvidia-drm/nvidia-drm-crtc.h
-+++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
-@@ -29,7 +29,7 @@
-
- #include "nvidia-drm-helper.h"
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvtypes.h"
- #include "nvkms-kapi.h"
-
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c
b/kernel/nvidia-drm/nvidia-drm-drv.c
-index a66d3cc..06bf859 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -39,7 +39,7 @@
-
- #include "nvidia-drm-ioctl.h"
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- /*
- * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h
b/kernel/nvidia-drm/nvidia-drm-encoder.h
-index bbaf986..af341a8 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.h
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
-@@ -32,7 +32,7 @@
- #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
- #include <drm/drm_encoder.h>
- #else
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #endif
-
- #include "nvkms-kapi.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h
b/kernel/nvidia-drm/nvidia-drm-fb.h
-index 7f292ce..d13bc4c 100644
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvidia-drm-gem-nvkms-memory.h"
- #include "nvkms-kapi.h"
-
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h
b/kernel/nvidia-drm/nvidia-drm-gem.h
-index b621969..326f810 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.h
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
-@@ -29,7 +29,7 @@
-
- #include "nvidia-drm-priv.h"
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
-
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c
b/kernel/nvidia-drm/nvidia-drm-helper.c
-index da602ac..e5d6daa 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.c
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
-@@ -31,7 +31,7 @@
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
- #include <drm/drm_atomic_uapi.h>
- #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h
b/kernel/nvidia-drm/nvidia-drm-helper.h
-index 8f050d8..71c4b90 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.h
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- /*
- * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
-diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h
b/kernel/nvidia-drm/nvidia-drm-modeset.h
-index 06659c5..e9d7b70 100644
---- a/kernel/nvidia-drm/nvidia-drm-modeset.h
-+++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev);
- void nv_drm_atomic_state_clear(struct drm_atomic_state *state);
-diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h
b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-index f43f851..7f4ff8b 100644
---- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
-+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-@@ -29,7 +29,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- /* Set to true when the atomic modeset feature is enabled. */
- extern bool nv_drm_modeset_module_param;
-diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-index 20da923..f3cc2b4 100644
---- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-+++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
-
-diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h
b/kernel/nvidia-drm/nvidia-drm-priv.h
-index 9076835..77a95f3 100644
---- a/kernel/nvidia-drm/nvidia-drm-priv.h
-+++ b/kernel/nvidia-drm/nvidia-drm-priv.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
-
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h
b/kernel/nvidia-drm/nvidia-drm-utils.h
-index 6d24120..95190c4 100644
---- a/kernel/nvidia-drm/nvidia-drm-utils.h
-+++ b/kernel/nvidia-drm/nvidia-drm-utils.h
-@@ -27,7 +27,7 @@
-
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
-
- struct NvKmsKapiConnectorInfo*
---
-2.20.1
-

[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (9e747f2484aec788b3b5ce31e156bd41ff4bb2fe), Florian Franzmann, 02/09/2020