From patchwork Sat Aug 4 00:21:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 10556609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3814D13B4 for ; Mon, 6 Aug 2018 08:21:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27912290F5 for ; Mon, 6 Aug 2018 08:21:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B99E2915E; Mon, 6 Aug 2018 08:21:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D33CB290F5 for ; Mon, 6 Aug 2018 08:21:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 377596E227; Mon, 6 Aug 2018 08:20:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E22806E7DC; Sat, 4 Aug 2018 00:21:57 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id f6-v6so3236196plo.1; Fri, 03 Aug 2018 17:21:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Lk/Nf14DXiH2q4i7OiDTuNaOniv+6pKtvltdbkxSRhQ=; b=Pyor+0NujvRy16EQnklrXqxApr6lfNmwX0DsseuUb7yEB152AJg/5nUNPKjKK018vi TEXEJlS5LcGdiGEg11z6zU/LvEdrQY2EZRKRoNcc+b9LMVlRreKUyFDwFhpHj8XbD+Xh 1ToGdyrJOKb8Du4vSmYdHyRqb+wfVAXXt2kbgfWjrNfhKzd/ma1sCTxvuv6qw3K8ITe1 aPmDgHxOafMW3d7rODRARxnnAC/XcCZzAGM1ZtLUXOlrlfBQ+ndRyHbIkAAJjloFXrGo HlWLB38BvkJiBbuAE/E6ffjKCPlUw+bS3800y0UdaFkgp6wk5QST55gPRM3KC+yPazYP YaMw== X-Gm-Message-State: AOUpUlEp2JgLMdPM0ukg7LebTmVfDeECIj+sXx6m/6dzIFpCUByD+fas y248ugjF9Ik/wjtt7zJxS2Y= X-Google-Smtp-Source: AAOMgpfoA09CsM7l7ByzuMqAQ9ieYbO+oAOkwKwrH9HZJC8p5I1b20k1eIh5arAhZtdjubmt5ZKRcA== X-Received: by 2002:a17:902:543:: with SMTP id 61-v6mr5504617plf.126.1533342117545; Fri, 03 Aug 2018 17:21:57 -0700 (PDT) Received: from localhost.localdomain ([2402:f000:1:4414:80c0:93b4:a4e2:6d2f]) by smtp.gmail.com with ESMTPSA id k6-v6sm5545032pgc.71.2018.08.03.17.21.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 17:21:56 -0700 (PDT) From: Jia-Ju Bai To: alexander.deucher@amd.com, christian.koenig@amd.com, David1.Zhou@amd.com, airlied@linux.ie Subject: [PATCH] gpu: drm: radeon: r300: Replace mdelay() with msleep() and usleep_range() in r300_asic_reset() Date: Sat, 4 Aug 2018 08:21:50 +0800 Message-Id: <20180804002150.18247-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.17.0 X-Mailman-Approved-At: Mon, 06 Aug 2018 08:20:19 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jia-Ju Bai , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP r300_asic_reset() is never called in atomic context. It calls mdelay() to busily wait, which is not necessary. mdelay() can be replaced with msleep() and usleep_range(). This is found by a static analysis tool named DCNS written by myself. Signed-off-by: Jia-Ju Bai --- drivers/gpu/drm/radeon/r300.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 21161aa8acbf..55cf02400d5a 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -434,9 +434,9 @@ int r300_asic_reset(struct radeon_device *rdev, bool hard) WREG32(R_0000F0_RBBM_SOFT_RESET, S_0000F0_SOFT_RESET_VAP(1) | S_0000F0_SOFT_RESET_GA(1)); RREG32(R_0000F0_RBBM_SOFT_RESET); - mdelay(500); + msleep(500); WREG32(R_0000F0_RBBM_SOFT_RESET, 0); - mdelay(1); + usleep_range(1000, 2000); status = RREG32(R_000E40_RBBM_STATUS); dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status); /* resetting the CP seems to be problematic sometimes it end up @@ -446,9 +446,9 @@ int r300_asic_reset(struct radeon_device *rdev, bool hard) */ WREG32(R_0000F0_RBBM_SOFT_RESET, S_0000F0_SOFT_RESET_CP(1)); RREG32(R_0000F0_RBBM_SOFT_RESET); - mdelay(500); + msleep(500); WREG32(R_0000F0_RBBM_SOFT_RESET, 0); - mdelay(1); + usleep_range(1000, 2000); status = RREG32(R_000E40_RBBM_STATUS); dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status); /* restore PCI & busmastering */