Attachment #472288 for bug #618144




    return 0;
}

static void nvidia_drm_unload(struct drm_device *dev)
{
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
    struct NvKmsKapiDevice *pDevice = NULL;


    if (!nvidia_drm_modeset_enabled(dev))
    {
        return;
    }

    mutex_lock(&nv_dev->lock);


#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */

    return;
}

#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)

Lines 511-520 static void nvidia_drm_vma_open(struct v Link Here

(-)work/kernel/nvidia-drm/nvidia-drm-gem.c (-2 / +2 lines)
511	* Note that nvidia_drm_vma_fault() can be called for different or same	511	* Note that nvidia_drm_vma_fault() can be called for different or same
512	* ranges of the same drm_gem_object simultaneously.	512	* ranges of the same drm_gem_object simultaneously.
513	*/	513	*/
514	static int nvidia_drm_vma_fault(struct vm_area_struct *vma,	514	static int nvidia_drm_vma_fault(struct vm_fault *vmf)
515	struct vm_fault *vmf)
516	{	515	{
517	unsigned long address = nv_page_fault_va(vmf);	516	unsigned long address = nv_page_fault_va(vmf);
		517	struct vm_area_struct *vma = vmf->vma;
518	struct drm_gem_object *gem = vma->vm_private_data;	518	struct drm_gem_object *gem = vma->vm_private_data;
519	struct nvidia_drm_gem_object *nv_gem =	519	struct nvidia_drm_gem_object *nv_gem =
520	DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);	520	DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);

Return to bug 618144

Lines 398-404 static int nvidia_drm_load(struct drm_de Link Here

(-)work/kernel/nvidia-drm/nvidia-drm-drv.c (-3 / +3 lines)
398	return 0;	398	return 0;
399	}	399	}
400		400
401	static int nvidia_drm_unload(struct drm_device *dev)	401	static void nvidia_drm_unload(struct drm_device *dev)
402	{	402	{
403	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	403	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
404	struct NvKmsKapiDevice *pDevice = NULL;	404	struct NvKmsKapiDevice *pDevice = NULL;
Lines 412-418 static int nvidia_drm_unload(struct drm_ Link Here
412		412
413	if (!nvidia_drm_modeset_enabled(dev))	413	if (!nvidia_drm_modeset_enabled(dev))
414	{	414	{
415	return 0;	415	return;
416	}	416	}
417		417
418	mutex_lock(&nv_dev->lock);	418	mutex_lock(&nv_dev->lock);
Lines 445-451 static int nvidia_drm_unload(struct drm_ Link Here
445		445
446	#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */	446	#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
447		447
448	return 0;	448	return;
449	}	449	}
450		450
451	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	451	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)