{"id":2530,"date":"2019-03-19T23:54:48","date_gmt":"2019-03-20T06:54:48","guid":{"rendered":"http:\/\/rglinuxtech.com\/?p=2530"},"modified":"2019-03-19T23:54:48","modified_gmt":"2019-03-20T06:54:48","slug":"nvidia-fix-for-418-43-to-work-with-kernel-5-1-rc1","status":"publish","type":"post","link":"https:\/\/rglinuxtech.com\/?p=2530","title":{"rendered":"NVIDIA – Fix for 418.43 to Work with Kernel 5.1-rc1.."},"content":{"rendered":"

I have done some more investigation into the NVIDIA compile failures with Kernel 5.1-rc1, and now have a – rather inelegant – solution.<\/p>\n

I found clues to some of the errors in a post relating to nouveau: https:\/\/lkml.org\/lkml\/2019\/2\/20\/50<\/a> and the rest were due to content removed from \/include\/drm\/drm_crtc_helper.h<\/span><\/strong> in Kernel 5.1-rc1: https:\/\/elixir.bootlin.com\/linux\/v5.1-rc1\/source\/include\/drm\/drm_crtc_helper.h<\/a> compared to: https:\/\/elixir.bootlin.com\/linux\/v5.0.3\/source\/include\/drm\/drm_crtc_helper.h<\/a>.\u00a0 I also incorporated the name change mentioned in my previous article, from list_is_first<\/strong> to nv_list_is_first<\/strong><\/p>\n

And from all this, made the following changes:<\/p>\n

In NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-drm<\/strong>, add #include <linux\/version.h><\/span><\/strong>\u00a0\u00a0 to nvidia-drm-connector.c nvidia-drm-drv.c nvidia-drm-encoder.c<\/span><\/strong> and nvidia-drm-gem-nvkms-memory.c<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/common\/inc\/nv-list-helpers.h<\/strong>
\nchange line 94
\nstatic inline int list_is_first(const struct list_head *list,<\/span><\/strong>
\nto
\nstatic inline int nv_list_is_first(const struct list_head *list,<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-drm\/nvidia-drm-connector.c<\/strong>
\naround line 203 add
\n#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\n\/* Add header constants missing after 5.1-rc1 *\/<\/span><\/strong>
\nint drm_helper_probe_single_connector_modes(struct drm_connector<\/span><\/strong>
\n*connector, uint32_t maxX,<\/span><\/strong>
\nuint32_t maxY);<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-drm\/nvidia-drm-drv.c<\/strong>
\naround line 37 add
\n#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\n\/* Add header constants missing after 5.1-rc1 *\/<\/span><\/strong>
\nvoid drm_kms_helper_poll_init(struct drm_device *dev);<\/span><\/strong>
\nvoid drm_kms_helper_poll_fini(struct drm_device *dev);<\/span><\/strong>
\nbool drm_helper_hpd_irq_event(struct drm_device *dev);<\/span><\/strong>
\nvoid drm_kms_helper_poll_disable(struct drm_device *dev);<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-drm\/nvidia-drm-encoder.c<\/strong>
\naround line 33 add
\n#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\n\/* Add header constants missing after 5.1-rc1 *\/<\/span><\/strong>
\nvoid drm_kms_helper_hotplug_event(struct drm_device *dev);<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

around line 161 add
\n#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\n\/* Add header constants missing after 5.1-rc1 *\/<\/span><\/strong>
\nint drm_helper_probe_single_connector_modes(struct drm_connector<\/span><\/strong>
\n*connector, uint32_t maxX,<\/span><\/strong>
\nuint32_t maxY);<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-drm\/nvidia-drm-gem-nvkms-memory.c<\/strong>
\nchange line 377
\nfrom
\nstatic int nv_drm_vma_fault(struct vm_fault *vmf)<\/span><\/strong>
\nto
\n#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\nstatic int nv_drm_vma_fault(struct vm_fault *vmf)<\/span><\/strong>
\n#else<\/span><\/strong>
\nstatic vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-uvm\/uvm8.c<\/strong>
\nchange line 176
\nfrom
\nstatic int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\nto
\n#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\nstatic int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\n#else<\/span><\/strong>
\nstatic vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

change line 515
\nfrom
\nstatic int uvm_vm_fault_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\nto
\n#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)<\/span><\/strong>
\nstatic int uvm_vm_fault_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\n#else<\/span><\/strong>
\nstatic vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)<\/span><\/strong>
\n#endif<\/span><\/strong><\/p>\n

NVIDIA-Linux-x86_64-418.43\/kernel\/nvidia-uvm\/uvm8_range_tree.c<\/strong>
\nchange line 34
\nfrom
\nif (list_is_first(&node->list, &tree->head))<\/span><\/strong>
\nto
\nif (nv_list_is_first(&node->list, &tree->head))<\/span><\/strong><\/p>\n

I did try to put the ‘missing’ kernel header items into a new header within the NVIDIA source code tree, and add references to that, but for some reason this produced more errors, so I left things as above..<\/p>\n

I have tested these changes, and the resulting code compiles cleanly:<\/p>\n

...............<\/span><\/strong>\r\nld -r -o \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-modeset\/nv-modeset-interface.o \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-modeset\/nvidia-modeset-linux.o<\/span><\/strong>\r\nBuilding modules, stage 2.<\/span><\/strong>\r\nMODPOST 4 modules<\/span><\/strong>\r\nCC \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-drm.mod.o<\/span><\/strong>\r\nLD [M] \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-drm.ko<\/span><\/strong>\r\nCC \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-modeset.mod.o<\/span><\/strong>\r\nLD [M] \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-modeset.ko<\/span><\/strong>\r\nCC \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-uvm.mod.o<\/span><\/strong>\r\nLD [M] \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia-uvm.ko<\/span><\/strong>\r\nCC \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia.mod.o<\/span><\/strong>\r\nLD [M] \/home\/rgadsdon\/kernel\/NVIDIA-Linux-x86_64-418.43-510patched\/kernel\/nvidia.ko<\/span><\/strong>\r\nmake[2]: Leaving directory '\/usr\/src\/linux-5.1-rc1'<\/span><\/strong>\r\nmake[1]: Leaving directory '\/usr\/src\/linux-5.1-rc1'<\/span><\/strong><\/pre>\n
– and the resulting nvidia—.ko modules load\/run OK (tested with Plasma\/KDE, and with HD video)<\/p>\n
Robert Gadsdon.\u00a0 March 19, 2019.<\/em><\/p>\n","protected":false},"excerpt":{"rendered":"
I have done some more investigation into the NVIDIA compile failures with Kernel 5.1-rc1, and now have a – rather inelegant – solution. I found clues to some of the errors in a post relating to nouveau: https:\/\/lkml.org\/lkml\/2019\/2\/20\/50 and the rest were due to content removed from \/include\/drm\/drm_crtc_helper.h in Kernel 5.1-rc1: https:\/\/elixir.bootlin.com\/linux\/v5.1-rc1\/source\/include\/drm\/drm_crtc_helper.h compared to: https:\/\/elixir.bootlin.com\/linux\/v5.0.3\/source\/include\/drm\/drm_crtc_helper.h.\u00a0 I also …<\/span> Continue reading →<\/span><\/a><\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"footnotes":""},"categories":[5,6,1238,11,14,15,18,19,1533],"tags":[2055,2053,1501,2054],"class_list":["post-2530","post","type-post","status-publish","format-standard","hentry","category-compilation","category-crash-and-burn","category-fix","category-hacks","category-kernel","category-linux-2","category-nvidia","category-opinion","category-patches","tag-fix-for-kernel-5-1-rc1","tag-nvidia-418-43","tag-tested","tag-works"],"_links":{"self":[{"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/posts\/2530","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2530"}],"version-history":[{"count":2,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/posts\/2530\/revisions"}],"predecessor-version":[{"id":2532,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=\/wp\/v2\/posts\/2530\/revisions\/2532"}],"wp:attachment":[{"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2530"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2530"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/rglinuxtech.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2530"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}