Removed the TTM Huge Page functionnality to address a crash, a timeout fix for udl, CONFIG_FB dependency improvements, a fix for a circular locking depency in imx, a NULL pointer dereference fix for virtio, and a naming collision fix for drm/locking. Signed-off-by: Dave Airlie <airlied@redhat.com>
Unified · Split
| @@ -6154,8 +6154,7 @@ T: git git://anongit.freedesktop.org/drm/drm · 6153 unmodified lines | ||
| 6154 | 6154 | F: Documentation/devicetree/bindings/display/ |
| 6155 | 6155 | F: Documentation/devicetree/bindings/gpu/ |
| 6156 | 6156 | F: Documentation/gpu/ |
| 6157 | −F: drivers/gpu/drm/ | |
| 6158 | −F: drivers/gpu/vga/ | |
| 6157 | +F: drivers/gpu/ | |
| 6159 | 6158 | F: include/drm/ |
| 6160 | 6159 | F: include/linux/vga* |
| 6161 | 6160 | F: include/uapi/drm/ |
| @@ -117,9 +117,8 @@ config DRM_DEBUG_MODESET_LOCK · 116 unmodified lines | ||
| 117 | 117 | |
| 118 | 118 | config DRM_FBDEV_EMULATION |
| 119 | 119 | bool "Enable legacy fbdev support for your modesetting driver" |
| 120 | − depends on DRM | |
| 121 | − depends on FB=y || FB=DRM | |
| 122 | − select DRM_KMS_HELPER | |
| 120 | + depends on DRM_KMS_HELPER | |
| 121 | + depends on FB=y || FB=DRM_KMS_HELPER | |
| 123 | 122 | select FB_CFB_FILLRECT |
| 124 | 123 | select FB_CFB_COPYAREA |
| 125 | 124 | select FB_CFB_IMAGEBLIT |
| @@ -60,9 +60,10 @@ static vm_fault_t amdgpu_gem_fault(struct vm_fault *vmf) · 59 unmodified lines | ||
| 60 | 60 | goto unlock; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | − ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot, | |
| 64 | − TTM_BO_VM_NUM_PREFAULT, 1); | |
| 65 | − drm_dev_exit(idx); | |
| 63 | + ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot, | |
| 64 | + TTM_BO_VM_NUM_PREFAULT); | |
| 65 | + | |
| 66 | + drm_dev_exit(idx); | |
| 66 | 67 | } else { |
| 67 | 68 | ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot); |
| 68 | 69 | } |
| @@ -79,7 +79,7 @@ · 78 unmodified lines | ||
| 79 | 79 | static DEFINE_WW_CLASS(crtc_ww_class); |
| 80 | 80 | |
| 81 | 81 | #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK) |
| 82 | −static noinline depot_stack_handle_t __stack_depot_save(void) | |
| 82 | +static noinline depot_stack_handle_t __drm_stack_depot_save(void) | |
| 83 | 83 | { |
| 84 | 84 | unsigned long entries[8]; |
| 85 | 85 | unsigned int n; |
| @@ -89,7 +89,7 @@ static noinline depot_stack_handle_t __stack_depot_save(void) · 3 unmodified lines | ||
| 89 | 89 | return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | −static void __stack_depot_print(depot_stack_handle_t stack_depot) | |
| 92 | +static void __drm_stack_depot_print(depot_stack_handle_t stack_depot) | |
| 93 | 93 | { |
| 94 | 94 | struct drm_printer p = drm_debug_printer("drm_modeset_lock"); |
| 95 | 95 | unsigned long *entries; |
| @@ -108,11 +108,11 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot) · 12 unmodified lines | ||
| 108 | 108 | kfree(buf); |
| 109 | 109 | } |
| 110 | 110 | #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */ |
| 111 | −static depot_stack_handle_t __stack_depot_save(void) | |
| 111 | +static depot_stack_handle_t __drm_stack_depot_save(void) | |
| 112 | 112 | { |
| 113 | 113 | return 0; |
| 114 | 114 | } |
| 115 | −static void __stack_depot_print(depot_stack_handle_t stack_depot) | |
| 115 | +static void __drm_stack_depot_print(depot_stack_handle_t stack_depot) | |
| 116 | 116 | { |
| 117 | 117 | } |
| 118 | 118 | #endif /* CONFIG_DRM_DEBUG_MODESET_LOCK */ |
| @@ -266,7 +266,7 @@ EXPORT_SYMBOL(drm_modeset_acquire_fini); · 147 unmodified lines | ||
| 266 | 266 | void drm_modeset_drop_locks(struct drm_modeset_acquire_ctx *ctx) |
| 267 | 267 | { |
| 268 | 268 | if (WARN_ON(ctx->contended)) |
| 269 | − __stack_depot_print(ctx->stack_depot); | |
| 269 | + __drm_stack_depot_print(ctx->stack_depot); | |
| 270 | 270 | |
| 271 | 271 | while (!list_empty(&ctx->locked)) { |
| 272 | 272 | struct drm_modeset_lock *lock; |
| @@ -286,7 +286,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, · 13 unmodified lines | ||
| 286 | 286 | int ret; |
| 287 | 287 | |
| 288 | 288 | if (WARN_ON(ctx->contended)) |
| 289 | − __stack_depot_print(ctx->stack_depot); | |
| 289 | + __drm_stack_depot_print(ctx->stack_depot); | |
| 290 | 290 | |
| 291 | 291 | if (ctx->trylock_only) { |
| 292 | 292 | lockdep_assert_held(&ctx->ww_ctx); |
| @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock, · 24 unmodified lines | ||
| 317 | 317 | ret = 0; |
| 318 | 318 | } else if (ret == -EDEADLK) { |
| 319 | 319 | ctx->contended = lock; |
| 320 | − ctx->stack_depot = __stack_depot_save(); | |
| 320 | + ctx->stack_depot = __drm_stack_depot_save(); | |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | return ret; |
| @@ -81,7 +81,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) · 80 unmodified lines | ||
| 81 | 81 | struct drm_plane_state *old_plane_state, *new_plane_state; |
| 82 | 82 | bool plane_disabling = false; |
| 83 | 83 | int i; |
| 84 | − bool fence_cookie = dma_fence_begin_signalling(); | |
| 85 | 84 | |
| 86 | 85 | drm_atomic_helper_commit_modeset_disables(dev, state); |
| 87 | 86 | |
| @@ -112,7 +111,6 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state) · 24 unmodified lines | ||
| 112 | 111 | } |
| 113 | 112 | |
| 114 | 113 | drm_atomic_helper_commit_hw_done(state); |
| 115 | − dma_fence_end_signalling(fence_cookie); | |
| 116 | 114 | } |
| 117 | 115 | |
| 118 | 116 | static const struct drm_mode_config_helper_funcs imx_drm_mode_config_helpers = { |
| @@ -56,7 +56,7 @@ static vm_fault_t nouveau_ttm_fault(struct vm_fault *vmf) · 55 unmodified lines | ||
| 56 | 56 | |
| 57 | 57 | nouveau_bo_del_io_reserve_lru(bo); |
| 58 | 58 | prot = vm_get_page_prot(vma->vm_flags); |
| 59 | − ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT, 1); | |
| 59 | + ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); | |
| 60 | 60 | nouveau_bo_add_io_reserve_lru(bo); |
| 61 | 61 | if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) |
| 62 | 62 | return ret; |
| @@ -61,7 +61,7 @@ static vm_fault_t radeon_gem_fault(struct vm_fault *vmf) · 60 unmodified lines | ||
| 61 | 61 | goto unlock_resv; |
| 62 | 62 | |
| 63 | 63 | ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot, |
| 64 | − TTM_BO_VM_NUM_PREFAULT, 1); | |
| 64 | + TTM_BO_VM_NUM_PREFAULT); | |
| 65 | 65 | if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) |
| 66 | 66 | goto unlock_mclk; |
| 67 | 67 | |
| @@ -173,89 +173,6 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo, · 172 unmodified lines | ||
| 173 | 173 | } |
| 174 | 174 | EXPORT_SYMBOL(ttm_bo_vm_reserve); |
| 175 | 175 | |
| 176 | −#ifdef CONFIG_TRANSPARENT_HUGEPAGE | |
| 177 | −/** | |
| 178 | − * ttm_bo_vm_insert_huge - Insert a pfn for PUD or PMD faults | |
| 179 | − * @vmf: Fault data | |
| 180 | − * @bo: The buffer object | |
| 181 | − * @page_offset: Page offset from bo start | |
| 182 | − * @fault_page_size: The size of the fault in pages. | |
| 183 | − * @pgprot: The page protections. | |
| 184 | − * Does additional checking whether it's possible to insert a PUD or PMD | |
| 185 | − * pfn and performs the insertion. | |
| 186 | − * | |
| 187 | − * Return: VM_FAULT_NOPAGE on successful insertion, VM_FAULT_FALLBACK if | |
| 188 | − * a huge fault was not possible, or on insertion error. | |
| 189 | − */ | |
| 190 | −static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, | |
| 191 | − struct ttm_buffer_object *bo, | |
| 192 | − pgoff_t page_offset, | |
| 193 | − pgoff_t fault_page_size, | |
| 194 | − pgprot_t pgprot) | |
| 195 | −{ | |
| 196 | − pgoff_t i; | |
| 197 | − vm_fault_t ret; | |
| 198 | − unsigned long pfn; | |
| 199 | − pfn_t pfnt; | |
| 200 | − struct ttm_tt *ttm = bo->ttm; | |
| 201 | − bool write = vmf->flags & FAULT_FLAG_WRITE; | |
| 202 | − | |
| 203 | − /* Fault should not cross bo boundary. */ | |
| 204 | − page_offset &= ~(fault_page_size - 1); | |
| 205 | − if (page_offset + fault_page_size > bo->resource->num_pages) | |
| 206 | − goto out_fallback; | |
| 207 | − | |
| 208 | − if (bo->resource->bus.is_iomem) | |
| 209 | − pfn = ttm_bo_io_mem_pfn(bo, page_offset); | |
| 210 | − else | |
| 211 | − pfn = page_to_pfn(ttm->pages[page_offset]); | |
| 212 | − | |
| 213 | − /* pfn must be fault_page_size aligned. */ | |
| 214 | − if ((pfn & (fault_page_size - 1)) != 0) | |
| 215 | − goto out_fallback; | |
| 216 | − | |
| 217 | − /* Check that memory is contiguous. */ | |
| 218 | − if (!bo->resource->bus.is_iomem) { | |
| 219 | − for (i = 1; i < fault_page_size; ++i) { | |
| 220 | − if (page_to_pfn(ttm->pages[page_offset + i]) != pfn + i) | |
| 221 | − goto out_fallback; | |
| 222 | − } | |
| 223 | − } else if (bo->bdev->funcs->io_mem_pfn) { | |
| 224 | − for (i = 1; i < fault_page_size; ++i) { | |
| 225 | − if (ttm_bo_io_mem_pfn(bo, page_offset + i) != pfn + i) | |
| 226 | − goto out_fallback; | |
| 227 | − } | |
| 228 | − } | |
| 229 | − | |
| 230 | − pfnt = __pfn_to_pfn_t(pfn, PFN_DEV); | |
| 231 | − if (fault_page_size == (HPAGE_PMD_SIZE >> PAGE_SHIFT)) | |
| 232 | − ret = vmf_insert_pfn_pmd_prot(vmf, pfnt, pgprot, write); | |
| 233 | −#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD | |
| 234 | − else if (fault_page_size == (HPAGE_PUD_SIZE >> PAGE_SHIFT)) | |
| 235 | − ret = vmf_insert_pfn_pud_prot(vmf, pfnt, pgprot, write); | |
| 236 | −#endif | |
| 237 | − else | |
| 238 | − WARN_ON_ONCE(ret = VM_FAULT_FALLBACK); | |
| 239 | − | |
| 240 | − if (ret != VM_FAULT_NOPAGE) | |
| 241 | − goto out_fallback; | |
| 242 | − | |
| 243 | − return VM_FAULT_NOPAGE; | |
| 244 | −out_fallback: | |
| 245 | − count_vm_event(THP_FAULT_FALLBACK); | |
| 246 | − return VM_FAULT_FALLBACK; | |
| 247 | −} | |
| 248 | −#else | |
| 249 | −static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, | |
| 250 | − struct ttm_buffer_object *bo, | |
| 251 | − pgoff_t page_offset, | |
| 252 | − pgoff_t fault_page_size, | |
| 253 | − pgprot_t pgprot) | |
| 254 | −{ | |
| 255 | − return VM_FAULT_FALLBACK; | |
| 256 | −} | |
| 257 | −#endif | |
| 258 | − | |
| 259 | 176 | /** |
| 260 | 177 | * ttm_bo_vm_fault_reserved - TTM fault helper |
| 261 | 178 | * @vmf: The struct vm_fault given as argument to the fault callback |
| @@ -263,7 +180,6 @@ static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, · 1 unmodified line | ||
| 263 | 180 | * @num_prefault: Maximum number of prefault pages. The caller may want to |
| 264 | 181 | * specify this based on madvice settings and the size of the GPU object |
| 265 | 182 | * backed by the memory. |
| 266 | − * @fault_page_size: The size of the fault in pages. | |
| 267 | 183 | * |
| 268 | 184 | * This function inserts one or more page table entries pointing to the |
| 269 | 185 | * memory backing the buffer object, and then returns a return code |
| @@ -277,8 +193,7 @@ static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf, · 7 unmodified lines | ||
| 277 | 193 | */ |
| 278 | 194 | vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, |
| 279 | 195 | pgprot_t prot, |
| 280 | − pgoff_t num_prefault, | |
| 281 | − pgoff_t fault_page_size) | |
| 196 | + pgoff_t num_prefault) | |
| 282 | 197 | { |
| 283 | 198 | struct vm_area_struct *vma = vmf->vma; |
| 284 | 199 | struct ttm_buffer_object *bo = vma->vm_private_data; |
| @@ -329,11 +244,6 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, · 44 unmodified lines | ||
| 329 | 244 | prot = pgprot_decrypted(prot); |
| 330 | 245 | } |
| 331 | 246 | |
| 332 | − /* We don't prefault on huge faults. Yet. */ | |
| 333 | − if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && fault_page_size != 1) | |
| 334 | − return ttm_bo_vm_insert_huge(vmf, bo, page_offset, | |
| 335 | − fault_page_size, prot); | |
| 336 | − | |
| 337 | 247 | /* |
| 338 | 248 | * Speculatively prefault a number of pages. Only error on |
| 339 | 249 | * first page. |
| @@ -429,7 +339,7 @@ vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) · 89 unmodified lines | ||
| 429 | 339 | |
| 430 | 340 | prot = vma->vm_page_prot; |
| 431 | 341 | if (drm_dev_enter(ddev, &idx)) { |
| 432 | − ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT, 1); | |
| 342 | + ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); | |
| 433 | 343 | drm_dev_exit(idx); |
| 434 | 344 | } else { |
| 435 | 345 | ret = ttm_bo_vm_dummy_page(vmf, prot); |
| @@ -30,7 +30,7 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block, · 29 unmodified lines | ||
| 30 | 30 | int bval = (i + block * EDID_LENGTH) << 8; |
| 31 | 31 | ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), |
| 32 | 32 | 0x02, (0x80 | (0x02 << 5)), bval, |
| 33 | − 0xA1, read_buff, 2, HZ); | |
| 33 | + 0xA1, read_buff, 2, 1000); | |
| 34 | 34 | if (ret < 1) { |
| 35 | 35 | DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret); |
| 36 | 36 | kfree(read_buff); |
| @@ -163,10 +163,11 @@ static __poll_t virtio_gpu_poll(struct file *filp, · 162 unmodified lines | ||
| 163 | 163 | struct drm_file *drm_file = filp->private_data; |
| 164 | 164 | struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv; |
| 165 | 165 | struct drm_device *dev = drm_file->minor->dev; |
| 166 | + struct virtio_gpu_device *vgdev = dev->dev_private; | |
| 166 | 167 | struct drm_pending_event *e = NULL; |
| 167 | 168 | __poll_t mask = 0; |
| 168 | 169 | |
| 169 | − if (!vfpriv->ring_idx_mask) | |
| 170 | + if (!vgdev->has_virgl_3d || !vfpriv || !vfpriv->ring_idx_mask) | |
| 170 | 171 | return drm_poll(filp, wait); |
| 171 | 172 | |
| 172 | 173 | poll_wait(filp, &drm_file->event_wait, wait); |
| @@ -1550,10 +1550,6 @@ void vmw_bo_dirty_unmap(struct vmw_buffer_object *vbo, · 1549 unmodified lines | ||
| 1550 | 1550 | pgoff_t start, pgoff_t end); |
| 1551 | 1551 | vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf); |
| 1552 | 1552 | vm_fault_t vmw_bo_vm_mkwrite(struct vm_fault *vmf); |
| 1553 | −#ifdef CONFIG_TRANSPARENT_HUGEPAGE | |
| 1554 | −vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf, | |
| 1555 | − enum page_entry_size pe_size); | |
| 1556 | −#endif | |
| 1557 | 1553 | |
| 1558 | 1554 | /* Transparent hugepage support - vmwgfx_thp.c */ |
| 1559 | 1555 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| @@ -477,7 +477,7 @@ vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf) · 476 unmodified lines | ||
| 477 | 477 | else |
| 478 | 478 | prot = vm_get_page_prot(vma->vm_flags); |
| 479 | 479 | |
| 480 | − ret = ttm_bo_vm_fault_reserved(vmf, prot, num_prefault, 1); | |
| 480 | + ret = ttm_bo_vm_fault_reserved(vmf, prot, num_prefault); | |
| 481 | 481 | if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) |
| 482 | 482 | return ret; |
| 483 | 483 | |
| @@ -486,73 +486,3 @@ out_unlock: · 2 unmodified lines | ||
| 486 | 486 | |
| 487 | 487 | return ret; |
| 488 | 488 | } |
| 489 | − | |
| 490 | −#ifdef CONFIG_TRANSPARENT_HUGEPAGE | |
| 491 | −vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf, | |
| 492 | − enum page_entry_size pe_size) | |
| 493 | −{ | |
| 494 | − struct vm_area_struct *vma = vmf->vma; | |
| 495 | − struct ttm_buffer_object *bo = (struct ttm_buffer_object *) | |
| 496 | − vma->vm_private_data; | |
| 497 | − struct vmw_buffer_object *vbo = | |
| 498 | − container_of(bo, struct vmw_buffer_object, base); | |
| 499 | − pgprot_t prot; | |
| 500 | − vm_fault_t ret; | |
| 501 | − pgoff_t fault_page_size; | |
| 502 | − bool write = vmf->flags & FAULT_FLAG_WRITE; | |
| 503 | − | |
| 504 | − switch (pe_size) { | |
| 505 | − case PE_SIZE_PMD: | |
| 506 | − fault_page_size = HPAGE_PMD_SIZE >> PAGE_SHIFT; | |
| 507 | − break; | |
| 508 | −#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD | |
| 509 | − case PE_SIZE_PUD: | |
| 510 | − fault_page_size = HPAGE_PUD_SIZE >> PAGE_SHIFT; | |
| 511 | − break; | |
| 512 | −#endif | |
| 513 | − default: | |
| 514 | − WARN_ON_ONCE(1); | |
| 515 | − return VM_FAULT_FALLBACK; | |
| 516 | − } | |
| 517 | − | |
| 518 | − /* Always do write dirty-tracking and COW on PTE level. */ | |
| 519 | − if (write && (READ_ONCE(vbo->dirty) || is_cow_mapping(vma->vm_flags))) | |
| 520 | − return VM_FAULT_FALLBACK; | |
| 521 | − | |
| 522 | − ret = ttm_bo_vm_reserve(bo, vmf); | |
| 523 | − if (ret) | |
| 524 | − return ret; | |
| 525 | − | |
| 526 | − if (vbo->dirty) { | |
| 527 | − pgoff_t allowed_prefault; | |
| 528 | − unsigned long page_offset; | |
| 529 | − | |
| 530 | − page_offset = vmf->pgoff - | |
| 531 | − drm_vma_node_start(&bo->base.vma_node); | |
| 532 | − if (page_offset >= bo->resource->num_pages || | |
| 533 | − vmw_resources_clean(vbo, page_offset, | |
| 534 | − page_offset + PAGE_SIZE, | |
| 535 | − &allowed_prefault)) { | |
| 536 | − ret = VM_FAULT_SIGBUS; | |
| 537 | − goto out_unlock; | |
| 538 | − } | |
| 539 | − | |
| 540 | − /* | |
| 541 | − * Write protect, so we get a new fault on write, and can | |
| 542 | − * split. | |
| 543 | − */ | |
| 544 | − prot = vm_get_page_prot(vma->vm_flags & ~VM_SHARED); | |
| 545 | − } else { | |
| 546 | − prot = vm_get_page_prot(vma->vm_flags); | |
| 547 | − } | |
| 548 | − | |
| 549 | − ret = ttm_bo_vm_fault_reserved(vmf, prot, 1, fault_page_size); | |
| 550 | − if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) | |
| 551 | − return ret; | |
| 552 | − | |
| 553 | −out_unlock: | |
| 554 | − dma_resv_unlock(bo->base.resv); | |
| 555 | − | |
| 556 | − return ret; | |
| 557 | −} | |
| 558 | −#endif | |
| @@ -61,9 +61,6 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma) · 60 unmodified lines | ||
| 61 | 61 | .fault = vmw_bo_vm_fault, |
| 62 | 62 | .open = ttm_bo_vm_open, |
| 63 | 63 | .close = ttm_bo_vm_close, |
| 64 | −#ifdef CONFIG_TRANSPARENT_HUGEPAGE | |
| 65 | − .huge_fault = vmw_bo_vm_huge_fault, | |
| 66 | −#endif | |
| 67 | 64 | }; |
| 68 | 65 | struct drm_file *file_priv = filp->private_data; |
| 69 | 66 | struct vmw_private *dev_priv = vmw_priv(file_priv->minor->dev); |
| @@ -584,8 +584,7 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo, · 583 unmodified lines | ||
| 584 | 584 | |
| 585 | 585 | vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, |
| 586 | 586 | pgprot_t prot, |
| 587 | − pgoff_t num_prefault, | |
| 588 | − pgoff_t fault_page_size); | |
| 587 | + pgoff_t num_prefault); | |
| 589 | 588 | |
| 590 | 589 | vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf); |
| 591 | 590 | |