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

Configure Feed

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

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
"The three nouveau fixes quiten unneeded dmesg spam that people are
seeing and pondering,

The udl fix stops it from trying to driver monitors that are too big,
where we get a black screen.

And a vmware memory alloc problem."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nvc0/fifo: ignore bits in PFIFO_INTR that aren't set in PFIFO_INTR_EN
drm/udl: limit modes to the sku pixel limits.
vmwgfx: corruption in vmw_event_fence_action_create()
drm/nvc0/ltcg: mask off intr 0x10
drm/nouveau: silence a debug message triggered by newer userspace

Linus Torvalds 63994137 a31fb698

+14 -4
+1 -1
drivers/gpu/drm/nouveau/nouveau_abi16.c
··· 179 179 return 0; 180 180 } else 181 181 if (init->class == 0x906e) { 182 - NV_ERROR(dev, "906e not supported yet\n"); 182 + NV_DEBUG(dev, "906e not supported yet\n"); 183 183 return -EINVAL; 184 184 } 185 185
+1
drivers/gpu/drm/nouveau/nvc0_fb.c
··· 124 124 priv = dev_priv->engine.fb.priv; 125 125 126 126 nv_wr32(dev, 0x100c10, priv->r100c10 >> 8); 127 + nv_mask(dev, 0x17e820, 0x00100000, 0x00000000); /* NV_PLTCG_INTR_EN */ 127 128 return 0; 128 129 } 129 130
+2 -1
drivers/gpu/drm/nouveau/nvc0_fifo.c
··· 373 373 static void 374 374 nvc0_fifo_isr(struct drm_device *dev) 375 375 { 376 - u32 stat = nv_rd32(dev, 0x002100); 376 + u32 mask = nv_rd32(dev, 0x002140); 377 + u32 stat = nv_rd32(dev, 0x002100) & mask; 377 378 378 379 if (stat & 0x00000100) { 379 380 NV_INFO(dev, "PFIFO: unknown status 0x00000100\n");
+2 -1
drivers/gpu/drm/nouveau/nve0_fifo.c
··· 345 345 static void 346 346 nve0_fifo_isr(struct drm_device *dev) 347 347 { 348 - u32 stat = nv_rd32(dev, 0x002100); 348 + u32 mask = nv_rd32(dev, 0x002140); 349 + u32 stat = nv_rd32(dev, 0x002100) & mask; 349 350 350 351 if (stat & 0x00000100) { 351 352 NV_INFO(dev, "PFIFO: unknown status 0x00000100\n");
+7
drivers/gpu/drm/udl/udl_connector.c
··· 69 69 static int udl_mode_valid(struct drm_connector *connector, 70 70 struct drm_display_mode *mode) 71 71 { 72 + struct udl_device *udl = connector->dev->dev_private; 73 + if (!udl->sku_pixel_limit) 74 + return 0; 75 + 76 + if (mode->vdisplay * mode->hdisplay > udl->sku_pixel_limit) 77 + return MODE_VIRTUAL_Y; 78 + 72 79 return 0; 73 80 } 74 81
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
··· 1018 1018 } 1019 1019 1020 1020 1021 - event = kzalloc(sizeof(event->event), GFP_KERNEL); 1021 + event = kzalloc(sizeof(*event), GFP_KERNEL); 1022 1022 if (unlikely(event == NULL)) { 1023 1023 DRM_ERROR("Failed to allocate an event.\n"); 1024 1024 ret = -ENOMEM;