- kernel-6.7.patch

* fixes build against kernel 6.7 (boo#1219117)

OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=73

kernel-6.7.patch

@@ -0,0 +1,25 @@
+diff -u -r open-gpu-kernel-modules-545.29.06.orig/kernel-open/nvidia/libspdm_shash.c open-gpu-kernel-modules-545.29.06/kernel-open/nvidia/libspdm_shash.c
+--- open-gpu-kernel-modules-545.29.06.orig/kernel-open/nvidia/libspdm_shash.c	2024-01-24 14:32:54.546727576 +0100
++++ open-gpu-kernel-modules-545.29.06/kernel-open/nvidia/libspdm_shash.c	2024-01-24 14:47:06.663986342 +0100
+@@ -20,6 +20,7 @@
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
++#include <linux/version.h>
+ 
+ #include "internal_crypt_lib.h"
+ 
+@@ -87,8 +88,13 @@
+ 
+         struct crypto_shash *src_tfm = src->tfm;
+         struct crypto_shash *dst_tfm = dst->tfm;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
++        char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1);
++        char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1);
++#else
+         char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
+         char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
++#endif
+         int ss = crypto_shash_statesize(dst_tfm);
+         memcpy(dst_ipad, src_ipad, crypto_shash_blocksize(src->tfm));
+         memcpy(dst_ipad + ss, src_ipad + ss, crypto_shash_blocksize(src->tfm));

nvidia-open-driver-G06-signed.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 24 13:39:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- kernel-6.7.patch
+  * fixes build against kernel 6.7 (boo#1219117) 
+
 -------------------------------------------------------------------
 Tue Jan  9 10:39:25 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 

nvidia-open-driver-G06-signed.spec

@@ -52,6 +52,7 @@ Source12:       pesign-spec-macros
 Source14:       group-source-files.pl
 Patch0:         0001-Don-t-override-INSTALL_MOD_DIR.patch
 Patch2:         persistent-nvidia-id-string.patch
+Patch3:         kernel-6.7.patch
 BuildRequires:  %{kernel_module_package_buildreqs}
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -96,6 +97,7 @@ for GeForce RTX 2000 series and newer GPUs.
 %setup -q -n open-gpu-kernel-modules-%{version}
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 set -- *
 mkdir source
 mv "$@" source/