| Message ID | 1304542180-2734-1-git-send-email-lists.tormod@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 4, 2011 at 4:49 PM, Tormod Volden <lists.tormod@gmail.com> wrote: > From: Tormod Volden <debian.tormod@gmail.com> > > Similar to what is being done for other chip families. While you are at it, you might want to update rv770, evergreen, and cayman. Alex > > Also fix typos in gart messages. > > Signed-off-by: Tormod Volden <debian.tormod@gmail.com> > --- > > Just noticed there is no gart initialization message on r600 like there > is for other chips, while studying a log with "unitialized" errors. > > Note that I do not have the hardware, so this has only been compile-tested > by me. > > Tormod > > > drivers/gpu/drm/radeon/r600.c | 2 ++ > drivers/gpu/drm/radeon/radeon_gart.c | 4 ++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > > 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; > -- > 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/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;