Attachment #575582 for bug #685346

Lines 91-97 Link Here

(-)a/kernel/common/inc/nv-list-helpers.h (-1 / +1 lines)
91	list_entry((pos)->member.next, typeof(*(pos)), member)	91	list_entry((pos)->member.next, typeof(*(pos)), member)
92	#endif	92	#endif
93		93
94	static inline int list_is_first(const struct list_head *list,	94	static inline int nv_list_is_first(const struct list_head *list,
95	const struct list_head *head)	95	const struct list_head *head)
96	{	96	{
97	return list->prev == head;	97	return list->prev == head;

Lines 20-25 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-connector.c (+8 lines)
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*/	21	*/
22		22
		23	#include <linux/version.h>
23	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */	24	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
24		25
25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	26	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
Lines 201-206 Link Here
201	return __nv_drm_connector_detect_internal(connector);	202	return __nv_drm_connector_detect_internal(connector);
202	}	203	}
203		204
		205	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
		206	/* Add header constants missing after 5.1 */
		207	int drm_helper_probe_single_connector_modes(struct drm_connector
		208	*connector, uint32_t maxX,
		209	uint32_t maxY);
		210	#endif
		211
204	static struct drm_connector_funcs nv_connector_funcs = {	212	static struct drm_connector_funcs nv_connector_funcs = {
205	#if defined NV_DRM_ATOMIC_HELPER_CONNECTOR_DPMS_PRESENT	213	#if defined NV_DRM_ATOMIC_HELPER_CONNECTOR_DPMS_PRESENT
206	.dpms = drm_atomic_helper_connector_dpms,	214	.dpms = drm_atomic_helper_connector_dpms,

Lines 20-25 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-drv.c (+9 lines)
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*/	21	*/
22		22
		23	#include <linux/version.h>
23	#include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */	24	#include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
24		25
25	#include "nvidia-drm-priv.h"	26	#include "nvidia-drm-priv.h"
Lines 35-40 Link Here
35	#include "nvidia-drm-gem-nvkms-memory.h"	36	#include "nvidia-drm-gem-nvkms-memory.h"
36	#include "nvidia-drm-gem-user-memory.h"	37	#include "nvidia-drm-gem-user-memory.h"
37		38
		39	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
		40	/* Add header constants missing after 5.1 */
		41	void drm_kms_helper_poll_init(struct drm_device *dev);
		42	void drm_kms_helper_poll_fini(struct drm_device *dev);
		43	bool drm_helper_hpd_irq_event(struct drm_device *dev);
		44	void drm_kms_helper_poll_disable(struct drm_device *dev);
		45	#endif
		46
38	#if defined(NV_DRM_AVAILABLE)	47	#if defined(NV_DRM_AVAILABLE)
39		48
40	#include "nvidia-drm-ioctl.h"	49	#include "nvidia-drm-ioctl.h"

Lines 20-25 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-encoder.c (+13 lines)
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*/	21	*/
22		22
		23	#include <linux/version.h>
23	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */	24	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
24		25
25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	26	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
Lines 31-36 Link Here
31	#include "nvidia-drm-crtc.h"	32	#include "nvidia-drm-crtc.h"
32	#include "nvidia-drm-helper.h"	33	#include "nvidia-drm-helper.h"
33		34
		35	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
		36	/* Add header constants missing after 5.1 */
		37	void drm_kms_helper_hotplug_event(struct drm_device *dev);
		38	#endif
		39
34	#include <drm/drm_crtc_helper.h>	40	#include <drm/drm_crtc_helper.h>
35		41
36	#include <drm/drm_atomic.h>	42	#include <drm/drm_atomic.h>
Lines 160-165 Link Here
160	{	166	{
161	struct nv_drm_device *nv_dev = to_nv_device(dev);	167	struct nv_drm_device *nv_dev = to_nv_device(dev);
162		168
		169	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
		170	/* Add header constants missing after 5.1 */
		171	int drm_helper_probe_single_connector_modes(struct drm_connector
		172	*connector, uint32_t maxX,
		173	uint32_t maxY);
		174	#endif
		175
163	struct NvKmsKapiStaticDisplayInfo *displayInfo = NULL;	176	struct NvKmsKapiStaticDisplayInfo *displayInfo = NULL;
164	struct NvKmsKapiConnectorInfo *connectorInfo = NULL;	177	struct NvKmsKapiConnectorInfo *connectorInfo = NULL;
165		178

Lines 20-25 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c (+5 lines)
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*/	21	*/
22		22
		23	#include <linux/version.h>
23	#include "nvidia-drm-conftest.h"	24	#include "nvidia-drm-conftest.h"
24		25
25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	26	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
Lines 268-274 Link Here
268	*/	269	*/
269		270
270	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)	271	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
		272	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
271	static int nv_drm_vma_fault(struct vm_fault *vmf)	273	static int nv_drm_vma_fault(struct vm_fault *vmf)
		274	#else
		275	static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
		276	#endif
272	{	277	{
273	return __nv_drm_vma_fault(vmf->vma, vmf);	278	return __nv_drm_vma_fault(vmf->vma, vmf);
274	}	279	}

Lines 172-178 Link Here

(-)a/kernel/nvidia-uvm/uvm8.c (+8 lines)
172	return VM_FAULT_SIGBUS;	172	return VM_FAULT_SIGBUS;
173	}	173	}
174		174
		175	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
175	static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)	176	static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
		177	#else
		178	static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
		179	#endif
176	{	180	{
177	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)	181	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
178	return uvm_vm_fault_sigbus(vmf->vma, vmf);	182	return uvm_vm_fault_sigbus(vmf->vma, vmf);
Lines 507-513 Link Here
507	}	511	}
508	}	512	}
509		513
		514	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
510	static int uvm_vm_fault_wrapper(struct vm_fault *vmf)	515	static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
		516	#else
		517	static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
		518	#endif
511	{	519	{
512	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)	520	#if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
513	return uvm_vm_fault(vmf->vma, vmf);	521	return uvm_vm_fault(vmf->vma, vmf);

Lines 31-37 Link Here

(-)a/kernel/nvidia-uvm/uvm8_range_tree.c (-1 / +1 lines)
31		31
32	uvm_range_tree_node_t uvm_range_tree_prev(uvm_range_tree_t tree, uvm_range_tree_node_t *node)	32	uvm_range_tree_node_t uvm_range_tree_prev(uvm_range_tree_t tree, uvm_range_tree_node_t *node)
33	{	33	{
34	if (list_is_first(&node->list, &tree->head))	34	if (nv_list_is_first(&node->list, &tree->head))
35	return NULL;	35	return NULL;
36	return list_prev_entry(node, list);	36	return list_prev_entry(node, list);
37	}	37	}

Return to bug 685346