Skip to content

Commit a54a200

Browse files
en4bzzackr
authored andcommitted
drm/vmwgfx: Standardize use of kibibytes when logging
Use the same standard abbreviation KiB instead of incorrect variants. Signed-off-by: Ian Forbes <[email protected]> Signed-off-by: Zack Rusin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent dde1de0 commit a54a200

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
746746
dev->vram_size = pci_resource_len(pdev, 2);
747747

748748
drm_info(&dev->drm,
749-
"Register MMIO at 0x%pa size is %llu kiB\n",
749+
"Register MMIO at 0x%pa size is %llu KiB\n",
750750
&rmmio_start, (uint64_t)rmmio_size / 1024);
751751
dev->rmmio = devm_ioremap(dev->drm.dev,
752752
rmmio_start,
@@ -765,7 +765,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
765765
fifo_size = pci_resource_len(pdev, 2);
766766

767767
drm_info(&dev->drm,
768-
"FIFO at %pa size is %llu kiB\n",
768+
"FIFO at %pa size is %llu KiB\n",
769769
&fifo_start, (uint64_t)fifo_size / 1024);
770770
dev->fifo_mem = devm_memremap(dev->drm.dev,
771771
fifo_start,
@@ -790,7 +790,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
790790
* SVGA_REG_VRAM_SIZE.
791791
*/
792792
drm_info(&dev->drm,
793-
"VRAM at %pa size is %llu kiB\n",
793+
"VRAM at %pa size is %llu KiB\n",
794794
&dev->vram_start, (uint64_t)dev->vram_size / 1024);
795795

796796
return 0;
@@ -984,13 +984,13 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id)
984984
dev_priv->max_primary_mem = dev_priv->vram_size;
985985
}
986986
drm_info(&dev_priv->drm,
987-
"Legacy memory limits: VRAM = %llu kB, FIFO = %llu kB, surface = %u kB\n",
987+
"Legacy memory limits: VRAM = %llu KiB, FIFO = %llu KiB, surface = %u KiB\n",
988988
(u64)dev_priv->vram_size / 1024,
989989
(u64)dev_priv->fifo_mem_size / 1024,
990990
dev_priv->memory_size / 1024);
991991

992992
drm_info(&dev_priv->drm,
993-
"MOB limits: max mob size = %u kB, max mob pages = %u\n",
993+
"MOB limits: max mob size = %u KiB, max mob pages = %u\n",
994994
dev_priv->max_mob_size / 1024, dev_priv->max_mob_pages);
995995

996996
ret = vmw_dma_masks(dev_priv);
@@ -1008,7 +1008,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id)
10081008
(unsigned)dev_priv->max_gmr_pages);
10091009
}
10101010
drm_info(&dev_priv->drm,
1011-
"Maximum display memory size is %llu kiB\n",
1011+
"Maximum display memory size is %llu KiB\n",
10121012
(uint64_t)dev_priv->max_primary_mem / 1024);
10131013

10141014
/* Need mmio memory to check for fifo pitchlock cap. */

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man,
9494
} else
9595
new_max_pages = gman->max_gmr_pages * 2;
9696
if (new_max_pages > gman->max_gmr_pages && new_max_pages >= gman->used_gmr_pages) {
97-
DRM_WARN("vmwgfx: increasing guest mob limits to %u kB.\n",
97+
DRM_WARN("vmwgfx: increasing guest mob limits to %u KiB.\n",
9898
((new_max_pages) << (PAGE_SHIFT - 10)));
9999

100100
gman->max_gmr_pages = new_max_pages;
101101
} else {
102102
char buf[256];
103103
snprintf(buf, sizeof(buf),
104-
"vmwgfx, error: guest graphics is out of memory (mob limit at: %ukB).\n",
104+
"vmwgfx, error: guest graphics is out of memory (mob limit at: %u KiB).\n",
105105
((gman->max_gmr_pages) << (PAGE_SHIFT - 10)));
106106
vmw_host_printf(buf);
107107
DRM_WARN("%s", buf);

0 commit comments

Comments
 (0)