From patchwork Wed May 4 20:49:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 755002 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p44KnqJ8032301 for ; Wed, 4 May 2011 20:50:13 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 56E8F9F63A for ; Wed, 4 May 2011 13:49:52 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wy0-f177.google.com (mail-wy0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 827769E930 for ; Wed, 4 May 2011 13:49:44 -0700 (PDT) Received: by wyb28 with SMTP id 28so1480132wyb.36 for ; Wed, 04 May 2011 13:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer; bh=LlVwY9nmGE4FeqzlvTMBLzSvk7+Gl+WpiGpdMvtWdLw=; b=TEQsn+j6lFR4v6KtlhjD9uNysP1W0E6X6goM7E6Fjaq5qRfduL//vO9HCw8jae7o5M jUCCP4C7bwdLUOMXHbp9Ow9euE4jxVgSwqN2NH6siAHn1ZH2vxWK84AQPSrWXAmDhRHq hWTJW/EbglSz8ycmFy7jlO7EZ8hrw8Thhgm00= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; b=Lsx7XIVn+DwbkWTrmA5Iixm2JyzJNtnFwIFy1omuqzwP575viTZjbCgSIz8F3+qdNm XkNQShwyCRrGqJm4XeZ5whm6Nadg8A9s3AeN6Kp+E0IvIajWbUYghrSrz3T49V5cYlFa fUvDj06+me5FB5azY8XLnET+2zJWkV4VHLRJo= Received: by 10.227.168.132 with SMTP id u4mr106788wby.50.1304542183316; Wed, 04 May 2011 13:49:43 -0700 (PDT) Received: from localhost.localdomain (80-219-113-251.dclient.hispeed.ch [80.219.113.251]) by mx.google.com with ESMTPS id h11sm933625wbc.60.2011.05.04.13.49.41 (version=SSLv3 cipher=OTHER); Wed, 04 May 2011 13:49:42 -0700 (PDT) From: Tormod Volden To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: Print out gart initialization details for r600 Date: Wed, 4 May 2011 22:49:40 +0200 Message-Id: <1304542180-2734-1-git-send-email-lists.tormod@gmail.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 04 May 2011 20:50:13 +0000 (UTC) From: Tormod Volden Similar to what is being done for other chip families. Also fix typos in gart messages. Signed-off-by: Tormod Volden --- 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;