hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/char/agp/intel-gtt.c
....@@ -1090,7 +1090,7 @@
10901090 }
10911091
10921092 if (intel_private.ifp_resource.start)
1093
- intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);
1093
+ intel_private.i9xx_flush_page = ioremap(intel_private.ifp_resource.start, PAGE_SIZE);
10941094 if (!intel_private.i9xx_flush_page)
10951095 dev_err(&intel_private.pcidev->dev,
10961096 "can't ioremap flush page - no chipset flushing\n");
....@@ -1409,13 +1409,16 @@
14091409
14101410 dev_info(&bridge_pdev->dev, "Intel %s Chipset\n", intel_gtt_chipsets[i].name);
14111411
1412
- mask = intel_private.driver->dma_mask_size;
1413
- if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
1414
- dev_err(&intel_private.pcidev->dev,
1415
- "set gfx device dma mask %d-bit failed!\n", mask);
1416
- else
1417
- pci_set_consistent_dma_mask(intel_private.pcidev,
1418
- DMA_BIT_MASK(mask));
1412
+ if (bridge) {
1413
+ mask = intel_private.driver->dma_mask_size;
1414
+ if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))
1415
+ dev_err(&intel_private.pcidev->dev,
1416
+ "set gfx device dma mask %d-bit failed!\n",
1417
+ mask);
1418
+ else
1419
+ pci_set_consistent_dma_mask(intel_private.pcidev,
1420
+ DMA_BIT_MASK(mask));
1421
+ }
14191422
14201423 if (intel_gtt_init() != 0) {
14211424 intel_gmch_remove();