tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo

Linus Torvalds dbc39ec4 4f427634

+7 -3
+2 -1
drivers/gpu/drm/drm_irq.c
··· 1012 1012 struct drm_file *file_priv) 1013 1013 { 1014 1014 struct drm_modeset_ctl *modeset = data; 1015 - int crtc, ret = 0; 1015 + int ret = 0; 1016 + unsigned int crtc; 1016 1017 1017 1018 /* If drm_vblank_init() hasn't been called yet, just no-op */ 1018 1019 if (!dev->num_crtcs)
+4 -1
drivers/gpu/drm/nouveau/nouveau_bo.c
··· 49 49 DRM_ERROR("bo %p still attached to GEM object\n", bo); 50 50 51 51 nv10_mem_put_tile_region(dev, nvbo->tile, NULL); 52 - nouveau_vm_put(&nvbo->vma); 52 + if (nvbo->vma.node) { 53 + nouveau_vm_unmap(&nvbo->vma); 54 + nouveau_vm_put(&nvbo->vma); 55 + } 53 56 kfree(nvbo); 54 57 } 55 58
+1 -1
include/drm/drmP.h
··· 1101 1101 struct platform_device *platformdev; /**< Platform device struture */ 1102 1102 1103 1103 struct drm_sg_mem *sg; /**< Scatter gather memory */ 1104 - int num_crtcs; /**< Number of CRTCs on this device */ 1104 + unsigned int num_crtcs; /**< Number of CRTCs on this device */ 1105 1105 void *dev_private; /**< device private data */ 1106 1106 void *mm_private; 1107 1107 struct address_space *dev_mapping;