| Message ID | 1304880398-4616-1-git-send-email-lists.tormod@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, May 8, 2011 at 2:46 PM, Tormod Volden <lists.tormod@gmail.com> wrote: > From: Tormod Volden <debian.tormod@gmail.com> > > The same way it was already done for r300. > > Also fix typo in gart warning messages. > > Signed-off-by: Tormod Volden <debian.tormod@gmail.com> > --- > >> While you are at it, you might want to update rv770, evergreen, and cayman. > >> Alex > > And all the others as well... > > Tormod > > PS. Why can't you keep the relatively logic r* naming? ni.c? There aren't any after r7xx. We stopped using Rxxx code names internally after r7xx, so we use the same codenames in the open source driver. Evergreen was the series after r7xx, and Northern Islands (NI) followed evergreen. Reviewed-by: Alex Deucher <alexdeucher@gmail.com> > > > > drivers/gpu/drm/radeon/evergreen.c | 2 ++ > drivers/gpu/drm/radeon/ni.c | 2 ++ > drivers/gpu/drm/radeon/r100.c | 2 ++ > drivers/gpu/drm/radeon/r600.c | 2 ++ > drivers/gpu/drm/radeon/radeon_gart.c | 4 ++-- > drivers/gpu/drm/radeon/rs400.c | 2 ++ > drivers/gpu/drm/radeon/rs600.c | 2 ++ > drivers/gpu/drm/radeon/rv770.c | 2 ++ > 8 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c > index e9bc135..e91d708 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -879,6 +879,8 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev) > WREG32(VM_CONTEXT1_CNTL, 0); > > evergreen_pcie_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c > index 7aade20..05b34f9 100644 > --- a/drivers/gpu/drm/radeon/ni.c > +++ b/drivers/gpu/drm/radeon/ni.c > @@ -991,6 +991,8 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev) > WREG32(VM_CONTEXT1_CNTL, 0); > > cayman_pcie_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c > index f2204cb..b67719c 100644 > --- a/drivers/gpu/drm/radeon/r100.c > +++ b/drivers/gpu/drm/radeon/r100.c > @@ -513,6 +513,8 @@ int r100_pci_gart_enable(struct radeon_device *rdev) > tmp = RREG32(RADEON_AIC_CNTL) | RADEON_PCIGART_TRANSLATE_EN; > WREG32(RADEON_AIC_CNTL, tmp); > r100_pci_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c > index 6f27593..3ca448f 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -986,6 +986,8 @@ int r600_pcie_gart_enable(struct radeon_device *rdev) > WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); > > r600_pcie_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c > index 8a955bb..674a6ca 100644 > --- a/drivers/gpu/drm/radeon/radeon_gart.c > +++ b/drivers/gpu/drm/radeon/radeon_gart.c > @@ -142,7 +142,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, > u64 page_base; > > if (!rdev->gart.ready) { > - WARN(1, "trying to unbind memory to unitialized GART !\n"); > + WARN(1, "trying to unbind memory to uninitialized GART !\n"); > return; > } > t = offset / RADEON_GPU_PAGE_SIZE; > @@ -174,7 +174,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset, > int i, j; > > if (!rdev->gart.ready) { > - WARN(1, "trying to bind memory to unitialized GART !\n"); > + WARN(1, "trying to bind memory to uninitialized GART !\n"); > return -EINVAL; > } > t = offset / RADEON_GPU_PAGE_SIZE; > diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c > index aa6a66e..d9dc25e 100644 > --- a/drivers/gpu/drm/radeon/rs400.c > +++ b/drivers/gpu/drm/radeon/rs400.c > @@ -182,6 +182,8 @@ int rs400_gart_enable(struct radeon_device *rdev) > /* Enable gart */ > WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | size_reg)); > rs400_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c > index 6e3b11e..3b6dce4 100644 > --- a/drivers/gpu/drm/radeon/rs600.c > +++ b/drivers/gpu/drm/radeon/rs600.c > @@ -484,6 +484,8 @@ int rs600_gart_enable(struct radeon_device *rdev) > tmp = RREG32_MC(R_000009_MC_CNTL1); > WREG32_MC(R_000009_MC_CNTL1, (tmp | S_000009_ENABLE_PAGE_TABLES(1))); > rs600_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c > index ef8a5ba..89b53ad 100644 > --- a/drivers/gpu/drm/radeon/rv770.c > +++ b/drivers/gpu/drm/radeon/rv770.c > @@ -158,6 +158,8 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev) > WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); > > r600_pcie_gart_tlb_flush(rdev); > + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", > + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); > rdev->gart.ready = true; > return 0; > } > -- > 1.7.0.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e9bc135..e91d708 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -879,6 +879,8 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev) WREG32(VM_CONTEXT1_CNTL, 0); evergreen_pcie_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 7aade20..05b34f9 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -991,6 +991,8 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev) WREG32(VM_CONTEXT1_CNTL, 0); cayman_pcie_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index f2204cb..b67719c 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -513,6 +513,8 @@ int r100_pci_gart_enable(struct radeon_device *rdev) tmp = RREG32(RADEON_AIC_CNTL) | RADEON_PCIGART_TRANSLATE_EN; WREG32(RADEON_AIC_CNTL, tmp); r100_pci_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 6f27593..3ca448f 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -986,6 +986,8 @@ int r600_pcie_gart_enable(struct radeon_device *rdev) WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); r600_pcie_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index 8a955bb..674a6ca 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -142,7 +142,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset, u64 page_base; if (!rdev->gart.ready) { - WARN(1, "trying to unbind memory to unitialized GART !\n"); + WARN(1, "trying to unbind memory to uninitialized GART !\n"); return; } t = offset / RADEON_GPU_PAGE_SIZE; @@ -174,7 +174,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset, int i, j; if (!rdev->gart.ready) { - WARN(1, "trying to bind memory to unitialized GART !\n"); + WARN(1, "trying to bind memory to uninitialized GART !\n"); return -EINVAL; } t = offset / RADEON_GPU_PAGE_SIZE; diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index aa6a66e..d9dc25e 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -182,6 +182,8 @@ int rs400_gart_enable(struct radeon_device *rdev) /* Enable gart */ WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | size_reg)); rs400_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 6e3b11e..3b6dce4 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -484,6 +484,8 @@ int rs600_gart_enable(struct radeon_device *rdev) tmp = RREG32_MC(R_000009_MC_CNTL1); WREG32_MC(R_000009_MC_CNTL1, (tmp | S_000009_ENABLE_PAGE_TABLES(1))); rs600_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; } diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index ef8a5ba..89b53ad 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -158,6 +158,8 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev) WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); r600_pcie_gart_tlb_flush(rdev); + DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n", + (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr); rdev->gart.ready = true; return 0; }