nvidia390: add patch for kernel 4.19

This commit is contained in:
Helmut Pozimski 2018-11-06 18:33:41 +01:00
parent dc9b57a24a
commit b47ea7cc1b
2 changed files with 60 additions and 1 deletions

View File

@ -0,0 +1,54 @@
Source: Hoshpak
Upstream: no
Reason: mode infix was removed from the two functions in linux-4.19
--- kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-06 18:13:04.524177827 +0100
+++ kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-06 18:13:44.110540624 +0100
@@ -30,6 +30,8 @@
#include "nvidia-drm-utils.h"
#include "nvidia-drm-encoder.h"
+#include <linux/version.h>
+
#include <drm/drm_crtc_helper.h>
#include <drm/drm_atomic.h>
@@ -226,8 +228,13 @@
if (nv_connector->edid != NULL) {
- drm_mode_connector_update_edid_property(
- connector, nv_connector->edid);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ drm_mode_connector_update_edid_property(
+ connector, nv_connector->edid);
+ #else
+ drm_connector_update_edid_property(
+ connector, nv_connector->edid);
+ #endif
}
while (1) {
--- kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-06 18:12:59.580066311 +0100
+++ kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-06 18:13:28.428920260 +0100
@@ -30,6 +30,8 @@
#include "nvidia-drm-connector.h"
#include "nvidia-drm-crtc.h"
+#include <linux/version.h>
+
#include <drm/drm_crtc_helper.h>
#include <drm/drm_atomic.h>
@@ -216,7 +218,11 @@
/* Attach encoder and connector */
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ ret = drm_mode_connector_attach_encoder(connector, encoder);
+ #else
+ ret = drm_connector_attach_encoder(connector, encoder);
+ #endif
if (ret != 0) {
NV_DRM_DEV_LOG_ERR(

View File

@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
pkgname=nvidia390
version=390.87
revision=1
revision=2
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -40,6 +40,11 @@ do_extract() {
rm -f ${_pkg}.run
}
do_configure() {
cd ${_pkg}
patch -p0 < ${FILESDIR}/kernel-4.19.patch
}
pre_install() {
cd ${_pkg}
cp nvidia_icd.json.template nvidia_icd.json