From patchwork Thu Jan 15 15:56:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 5641271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3966C058D for ; Thu, 15 Jan 2015 15:56:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCEDF201C8 for ; Thu, 15 Jan 2015 15:56:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A0D8020173 for ; Thu, 15 Jan 2015 15:56:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAA436E79A; Thu, 15 Jan 2015 07:56:56 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f178.google.com (mail-qc0-f178.google.com [209.85.216.178]) by gabe.freedesktop.org (Postfix) with ESMTP id BD3F96E79A for ; Thu, 15 Jan 2015 07:56:55 -0800 (PST) Received: by mail-qc0-f178.google.com with SMTP id p6so12723019qcv.9 for ; Thu, 15 Jan 2015 07:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=gE2d24BqWARewK7fVhOrJBQJ5XNr8NWJGVpU8f2Hi28=; b=TLStLAEiAqWMJGIO6H9QXzg3yaU4N0LnFCI99K6yY/gM3Irxi0w78cW97eh+rL0Ye3 Sm3WwfGnt+AeoyyXFqPZQTiLWyz8QAAiWC7R4EssjEF97FrqSORzkMYsaB6Hv2wE/8jl EM/I8jKR36OZFevFYzQPRrT97vedCl62fURTPmxRacwLzhiSsaXrkEPi9u0uaAyT1Lj3 /ZIgrbd/oT/HAUfD6NYCync9UyrDU2rLAVEt0GjOkuIwBqdoLGLk960k1oOIw/fa6Mms wX0tRjQ8kFj5Tfx4nqtYUShCzB2dSSFv7PRJofOZ0TL4Fx6dwLTr6ZhtbIXgaKVysFrM +JNw== MIME-Version: 1.0 X-Received: by 10.140.83.163 with SMTP id j32mr5438641qgd.52.1421337415082; Thu, 15 Jan 2015 07:56:55 -0800 (PST) Received: by 10.140.83.232 with HTTP; Thu, 15 Jan 2015 07:56:54 -0800 (PST) In-Reply-To: References: <1421175345-6635-1-git-send-email-rickard_strandqvist@spectrumdigital.se> Date: Thu, 15 Jan 2015 10:56:54 -0500 Message-ID: Subject: Re: [PATCH] drm/radeon/rv515: Remove unused function From: Alex Deucher To: Jerome Glisse Cc: Alex Deucher , LKML , =?UTF-8?Q?Christian_K=C3=B6nig?= , Maling list - DRI developers , Rickard Strandqvist X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Jan 15, 2015 at 10:43 AM, Jerome Glisse wrote: > This one looks highly suspicious, i need to check, but i would think > that this function should be use ! Yeah, I think the attached patch is probably correct. Although r5xx has been using the r300 ring start function for a while apparently. Alex > > On Wed, Jan 14, 2015 at 4:44 PM, Alex Deucher wrote: >> On Tue, Jan 13, 2015 at 1:55 PM, Rickard Strandqvist >> wrote: >>> Remove the function rv515_ring_start() that is not used anywhere. >>> >>> This was partially found by using a static code analysis program called cppcheck. >>> >>> Signed-off-by: Rickard Strandqvist >> >> Applied. thanks! >> >> Alex >> >>> --- >>> drivers/gpu/drm/radeon/radeon_asic.h | 1 - >>> drivers/gpu/drm/radeon/rv515.c | 68 ---------------------------------- >>> 2 files changed, 69 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h >>> index d8ace5b..52667b3 100644 >>> --- a/drivers/gpu/drm/radeon/radeon_asic.h >>> +++ b/drivers/gpu/drm/radeon/radeon_asic.h >>> @@ -280,7 +280,6 @@ int rv515_init(struct radeon_device *rdev); >>> void rv515_fini(struct radeon_device *rdev); >>> uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg); >>> void rv515_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); >>> -void rv515_ring_start(struct radeon_device *rdev, struct radeon_ring *ring); >>> void rv515_bandwidth_update(struct radeon_device *rdev); >>> int rv515_resume(struct radeon_device *rdev); >>> int rv515_suspend(struct radeon_device *rdev); >>> diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c >>> index 8a477bf..cb966e6 100644 >>> --- a/drivers/gpu/drm/radeon/rv515.c >>> +++ b/drivers/gpu/drm/radeon/rv515.c >>> @@ -59,74 +59,6 @@ void rv515_debugfs(struct radeon_device *rdev) >>> } >>> } >>> >>> -void rv515_ring_start(struct radeon_device *rdev, struct radeon_ring *ring) >>> -{ >>> - int r; >>> - >>> - r = radeon_ring_lock(rdev, ring, 64); >>> - if (r) { >>> - return; >>> - } >>> - radeon_ring_write(ring, PACKET0(ISYNC_CNTL, 0)); >>> - radeon_ring_write(ring, >>> - ISYNC_ANY2D_IDLE3D | >>> - ISYNC_ANY3D_IDLE2D | >>> - ISYNC_WAIT_IDLEGUI | >>> - ISYNC_CPSCRATCH_IDLEGUI); >>> - radeon_ring_write(ring, PACKET0(WAIT_UNTIL, 0)); >>> - radeon_ring_write(ring, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN); >>> - radeon_ring_write(ring, PACKET0(R300_DST_PIPE_CONFIG, 0)); >>> - radeon_ring_write(ring, R300_PIPE_AUTO_CONFIG); >>> - radeon_ring_write(ring, PACKET0(GB_SELECT, 0)); >>> - radeon_ring_write(ring, 0); >>> - radeon_ring_write(ring, PACKET0(GB_ENABLE, 0)); >>> - radeon_ring_write(ring, 0); >>> - radeon_ring_write(ring, PACKET0(R500_SU_REG_DEST, 0)); >>> - radeon_ring_write(ring, (1 << rdev->num_gb_pipes) - 1); >>> - radeon_ring_write(ring, PACKET0(VAP_INDEX_OFFSET, 0)); >>> - radeon_ring_write(ring, 0); >>> - radeon_ring_write(ring, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0)); >>> - radeon_ring_write(ring, RB3D_DC_FLUSH | RB3D_DC_FREE); >>> - radeon_ring_write(ring, PACKET0(ZB_ZCACHE_CTLSTAT, 0)); >>> - radeon_ring_write(ring, ZC_FLUSH | ZC_FREE); >>> - radeon_ring_write(ring, PACKET0(WAIT_UNTIL, 0)); >>> - radeon_ring_write(ring, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN); >>> - radeon_ring_write(ring, PACKET0(GB_AA_CONFIG, 0)); >>> - radeon_ring_write(ring, 0); >>> - radeon_ring_write(ring, PACKET0(RB3D_DSTCACHE_CTLSTAT, 0)); >>> - radeon_ring_write(ring, RB3D_DC_FLUSH | RB3D_DC_FREE); >>> - radeon_ring_write(ring, PACKET0(ZB_ZCACHE_CTLSTAT, 0)); >>> - radeon_ring_write(ring, ZC_FLUSH | ZC_FREE); >>> - radeon_ring_write(ring, PACKET0(GB_MSPOS0, 0)); >>> - radeon_ring_write(ring, >>> - ((6 << MS_X0_SHIFT) | >>> - (6 << MS_Y0_SHIFT) | >>> - (6 << MS_X1_SHIFT) | >>> - (6 << MS_Y1_SHIFT) | >>> - (6 << MS_X2_SHIFT) | >>> - (6 << MS_Y2_SHIFT) | >>> - (6 << MSBD0_Y_SHIFT) | >>> - (6 << MSBD0_X_SHIFT))); >>> - radeon_ring_write(ring, PACKET0(GB_MSPOS1, 0)); >>> - radeon_ring_write(ring, >>> - ((6 << MS_X3_SHIFT) | >>> - (6 << MS_Y3_SHIFT) | >>> - (6 << MS_X4_SHIFT) | >>> - (6 << MS_Y4_SHIFT) | >>> - (6 << MS_X5_SHIFT) | >>> - (6 << MS_Y5_SHIFT) | >>> - (6 << MSBD1_SHIFT))); >>> - radeon_ring_write(ring, PACKET0(GA_ENHANCE, 0)); >>> - radeon_ring_write(ring, GA_DEADLOCK_CNTL | GA_FASTSYNC_CNTL); >>> - radeon_ring_write(ring, PACKET0(GA_POLY_MODE, 0)); >>> - radeon_ring_write(ring, FRONT_PTYPE_TRIANGE | BACK_PTYPE_TRIANGE); >>> - radeon_ring_write(ring, PACKET0(GA_ROUND_MODE, 0)); >>> - radeon_ring_write(ring, GEOMETRY_ROUND_NEAREST | COLOR_ROUND_NEAREST); >>> - radeon_ring_write(ring, PACKET0(0x20C8, 0)); >>> - radeon_ring_write(ring, 0); >>> - radeon_ring_unlock_commit(rdev, ring, false); >>> -} >>> - >>> int rv515_mc_wait_for_idle(struct radeon_device *rdev) >>> { >>> unsigned i; >>> -- >>> 1.7.10.4 >>> >>> _______________________________________________ >>> dri-devel mailing list >>> dri-devel@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/dri-devel >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel From 39cd26b5d602f57a114def29b8c0931b4069da89 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 15 Jan 2015 10:52:33 -0500 Subject: [PATCH] drm/radeon: use rv515_ring_start on r5xx At some point these seems to have been lost in favor of the r300_ring_start function. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_asic.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index 6e47662..f811ee1 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -333,6 +333,20 @@ static struct radeon_asic_ring r300_gfx_ring = { .set_wptr = &r100_gfx_set_wptr, }; +static struct radeon_asic_ring rv515_gfx_ring = { + .ib_execute = &r100_ring_ib_execute, + .emit_fence = &r300_fence_ring_emit, + .emit_semaphore = &r100_semaphore_ring_emit, + .cs_parse = &r300_cs_parse, + .ring_start = &rv515_ring_start, + .ring_test = &r100_ring_test, + .ib_test = &r100_ib_test, + .is_lockup = &r100_gpu_is_lockup, + .get_rptr = &r100_gfx_get_rptr, + .get_wptr = &r100_gfx_get_wptr, + .set_wptr = &r100_gfx_set_wptr, +}; + static struct radeon_asic r300_asic = { .init = &r300_init, .fini = &r300_fini, @@ -744,7 +758,7 @@ static struct radeon_asic rv515_asic = { .set_page = &rv370_pcie_gart_set_page, }, .ring = { - [RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring + [RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring }, .irq = { .set = &rs600_irq_set, @@ -810,7 +824,7 @@ static struct radeon_asic r520_asic = { .set_page = &rv370_pcie_gart_set_page, }, .ring = { - [RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring + [RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring }, .irq = { .set = &rs600_irq_set, -- 1.8.3.1