summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2024-08-13 00:00:38 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2024-08-13 00:00:38 +0000
commitd772c8df8ec6b07b5b12adc0bd96dad269c6c2ef (patch)
tree2b554f0bfd4cbf8f87590c4488fa1c0a8025d2b1 /sys
parentc2d9facadc5c21afacfea8900368895f775e2a7c (diff)
drm/i915: Remove ad-hoc lmem/stolen debugs
From Ville Syrjala 8f7cf0a215b34ef12b4b862f260a592b4ab37a52 in mainline linux
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/i915/gem/i915_gem_stolen.c8
-rw-r--r--sys/dev/pci/drm/i915/gt/intel_region_lmem.c3
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c b/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
index e20f2346871..b8a19413320 100644
--- a/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
+++ b/sys/dev/pci/drm/i915/gem/i915_gem_stolen.c
@@ -832,7 +832,6 @@ static const struct intel_memory_region_ops i915_region_stolen_smem_ops = {
static int init_stolen_lmem(struct intel_memory_region *mem)
{
- struct drm_i915_private *i915 = mem->i915;
int err;
if (GEM_WARN_ON(resource_size(&mem->region) == 0))
@@ -863,19 +862,16 @@ static int init_stolen_lmem(struct intel_memory_region *mem)
for (i = 0; i < atop(resource_size(&mem->io)); i++)
atomic_setbits_int(&(pgs[i].pg_flags), PG_PMAP_WC);
- if (bus_space_map(i915->bst, mem->io.start, resource_size(&mem->io),
+ if (bus_space_map(mem->i915->bst, mem->io.start, resource_size(&mem->io),
BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, &bsh))
panic("can't map stolen lmem");
mem->iomap.base = mem->io.start;
mem->iomap.size = resource_size(&mem->io);
- mem->iomap.iomem = bus_space_vaddr(i915->bst, bsh);
+ mem->iomap.iomem = bus_space_vaddr(mem->i915->bst, bsh);
}
#endif
- drm_dbg(&i915->drm, "Stolen Local DSM: %pR\n", &mem->region);
- drm_dbg(&i915->drm, "Stolen Local memory IO: %pR\n", &mem->io);
-
return 0;
#ifdef __linux__
err_cleanup:
diff --git a/sys/dev/pci/drm/i915/gt/intel_region_lmem.c b/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
index 2516626adbf..17f6d07666d 100644
--- a/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
+++ b/sys/dev/pci/drm/i915/gt/intel_region_lmem.c
@@ -326,9 +326,6 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
if (err)
goto err_region_put;
- drm_dbg(&i915->drm, "Local memory: %pR\n", &mem->region);
- drm_dbg(&i915->drm, "Local memory IO: %pR\n", &mem->io);
-
if (io_size < lmem_size)
drm_info(&i915->drm, "Using a reduced BAR size of %lluMiB. Consider enabling 'Resizable BAR' or similar, if available in the BIOS.\n",
(u64)io_size >> 20);