From patchwork Wed Jul 27 12:24:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 1011742 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6RCOQ1E005099 for ; Wed, 27 Jul 2011 12:24:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB54B9E9FF for ; Wed, 27 Jul 2011 05:24:25 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com [209.85.161.53]) by gabe.freedesktop.org (Postfix) with ESMTP id B00629E7B3 for ; Wed, 27 Jul 2011 05:24:12 -0700 (PDT) Received: by fxd23 with SMTP id 23so391676fxd.26 for ; Wed, 27 Jul 2011 05:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=LVoXL2rmiPCufetJgzvTDNocaGNcNDm2LEQkqQ9uiGY=; b=qrwMY2Q1iV+b5oJgTQc+IDVgCZ6Z6P5CGFTV8z7k1JgzqS5QoLnMZMq8ItAKYKcmkc i58YiEavOcWaDNOGa0eJ5qIXfA1S0DBmRAPUzaYj7T9+RbmOkLbfF10Odi/xkVDGhQ1I kdZpauvsFEXzRqyKXcF8okS9H0tiSFm9iOjJA= MIME-Version: 1.0 Received: by 10.204.138.78 with SMTP id z14mr503970bkt.44.1311769451553; Wed, 27 Jul 2011 05:24:11 -0700 (PDT) Received: by 10.204.116.73 with HTTP; Wed, 27 Jul 2011 05:24:11 -0700 (PDT) In-Reply-To: <1309896774-2629-2-git-send-email-lists.tormod@gmail.com> References: <1309896774-2629-1-git-send-email-lists.tormod@gmail.com> <1309896774-2629-2-git-send-email-lists.tormod@gmail.com> Date: Wed, 27 Jul 2011 14:24:11 +0200 Message-ID: Subject: [PATCH v2] drm/radeon: Print gart initialization details on all chipsets From: Tormod Volden To: Dave Airlie Cc: dri-devel@lists.freedesktop.org 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: , 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, 27 Jul 2011 12:24:48 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter1.kernel.org id p6RCOQ1E005099 From: Tormod Volden The same way it was already done for r300. Also fix typo in gart warning messages. v2: Replace 0x%08X string format by %p Signed-off-by: Tormod Volden --- On Mon, Jul 25, 2011 at 1:03 PM, Dave Airlie wrote: > Causes a new warning per line on x86-64 build. > > dma_addr_t doesn't go into %08x. > > Dave. Would it be good enough to replace the %08x by %p, like in this patch? I will be unable to test anything for the next week so feel free to modify the patch as needed. (Hope the mailer won't reformat it.) Tormod  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(-) -- 1.7.0.4 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 %p).\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 %p).\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 %p).\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 %p).\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 %p).\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 %p).\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 %p).\n", +                (unsigned)(rdev->mc.gtt_size >> 20), rdev->gart.table_addr);        rdev->gart.ready = true;        return 0;  }