Commit a54a200f authored by Ian Forbes's avatar Ian Forbes Committed by Zack Rusin
Browse files

drm/vmwgfx: Standardize use of kibibytes when logging 



Use the same standard abbreviation KiB instead of incorrect variants.

Signed-off-by: default avatarIan Forbes <ian.forbes@broadcom.com>
Signed-off-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240521184720.767-5-ian.forbes@broadcom.com
parent dde1de06

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
		dev->vram_size = pci_resource_len(pdev, 2);



		drm_info(&dev->drm,

			"Register MMIO at 0x%pa size is %llu kiB\n",

			"Register MMIO at 0x%pa size is %llu KiB\n",

			 &rmmio_start, (uint64_t)rmmio_size / 1024);

		dev->rmmio = devm_ioremap(dev->drm.dev,

					  rmmio_start,
@@ -765,7 +765,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
		fifo_size = pci_resource_len(pdev, 2);



		drm_info(&dev->drm,

			 "FIFO at %pa size is %llu kiB\n",

			 "FIFO at %pa size is %llu KiB\n",

			 &fifo_start, (uint64_t)fifo_size / 1024);

		dev->fifo_mem = devm_memremap(dev->drm.dev,

					      fifo_start,
@@ -790,7 +790,7 @@ static int vmw_setup_pci_resources(struct vmw_private *dev, 
	 * SVGA_REG_VRAM_SIZE.

	 */

	drm_info(&dev->drm,

		 "VRAM at %pa size is %llu kiB\n",

		 "VRAM at %pa size is %llu KiB\n",

		 &dev->vram_start, (uint64_t)dev->vram_size / 1024);



	return 0;
@@ -984,13 +984,13 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
		dev_priv->max_primary_mem = dev_priv->vram_size;

	}

	drm_info(&dev_priv->drm,

		 "Legacy memory limits: VRAM = %llu kB, FIFO = %llu kB, surface = %u kB\n",

		 "Legacy memory limits: VRAM = %llu KiB, FIFO = %llu KiB, surface = %u KiB\n",

		 (u64)dev_priv->vram_size / 1024,

		 (u64)dev_priv->fifo_mem_size / 1024,

		 dev_priv->memory_size / 1024);



	drm_info(&dev_priv->drm,

		 "MOB limits: max mob size = %u kB, max mob pages = %u\n",

		 "MOB limits: max mob size = %u KiB, max mob pages = %u\n",

		 dev_priv->max_mob_size / 1024, dev_priv->max_mob_pages);



	ret = vmw_dma_masks(dev_priv);
@@ -1008,7 +1008,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
			 (unsigned)dev_priv->max_gmr_pages);

	}

	drm_info(&dev_priv->drm,

		 "Maximum display memory size is %llu kiB\n",

		 "Maximum display memory size is %llu KiB\n",

		 (uint64_t)dev_priv->max_primary_mem / 1024);



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

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

+2 −2
Original line number Diff line number Diff line
@@ -94,14 +94,14 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man, 
			} else

				new_max_pages = gman->max_gmr_pages * 2;

			if (new_max_pages > gman->max_gmr_pages && new_max_pages >= gman->used_gmr_pages) {

				DRM_WARN("vmwgfx: increasing guest mob limits to %u kB.\n",

				DRM_WARN("vmwgfx: increasing guest mob limits to %u KiB.\n",

					 ((new_max_pages) << (PAGE_SHIFT - 10)));



				gman->max_gmr_pages = new_max_pages;

			} else {

				char buf[256];

				snprintf(buf, sizeof(buf),

					 "vmwgfx, error: guest graphics is out of memory (mob limit at: %ukB).\n",

					 "vmwgfx, error: guest graphics is out of memory (mob limit at: %u KiB).\n",

					 ((gman->max_gmr_pages) << (PAGE_SHIFT - 10)));

				vmw_host_printf(buf);

				DRM_WARN("%s", buf);