From patchwork Sat May 25 20:43:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10961133 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 A7B171708 for ; Sat, 25 May 2019 20:43:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96A1628AA8 for ; Sat, 25 May 2019 20:43:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B19528AAB; Sat, 25 May 2019 20:43:55 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable 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 B95C728A93 for ; Sat, 25 May 2019 20:43:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CB906E17E; Sat, 25 May 2019 20:43:48 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 854AA6E179; Sat, 25 May 2019 20:43:42 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id z5so11491747lji.10; Sat, 25 May 2019 13:43:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E+IbTkqQdZIcyZ+fBbhT4Ah4Mh1U2qaUUK0vC3RuDmc=; b=rR0ZJXa+KSupt0N6DoFNwty2ji3WtpclPvnM406DOR6cNxibIm4EbQ8lKhfaTSu1iB M53eaJYqtreE6XiqgYLEPiAwAG+oDwHqOpiK/pmR7NCF7JfbKlu7c9TyvEXvHnZ45z33 ccWpOORHM7iuY/mS82qGfIGT6WcUSpu5CtA9qOorAoPIGPwgpMiFwjczHUA28ip/F9Xq dgZklTmTHH1X+3jemUc4WCGI1t57Jgjre5q9YIlrTSODrVT7S75/CMlP4f6ic1ByS9fM H2ioPlnSnMV4Lu0Jy2+f2HJ9jxSyyR6JzlAtYD3KCUCKw1qKAADdUuYUf2uZIbjG3DeT 4cBg== X-Gm-Message-State: APjAAAXrvtjYQqLOuTMVi17qCatGPGds3mBieUzIry9E+ZkIL4Q/GXnu JgxCU5pwLEw7CwdrrMUdwAFsrBa/ X-Google-Smtp-Source: APXvYqzNIZam+xs4mQoiquZxKtWOaikG22UDA8p2dzC6n6t6monOM57uRrGyNahQ9Nn+6nByLWnwJQ== X-Received: by 2002:a2e:5515:: with SMTP id j21mr30297898ljb.198.1558817020700; Sat, 25 May 2019 13:43:40 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id i187sm1328569lfe.64.2019.05.25.13.43.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 May 2019 13:43:40 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Date: Sat, 25 May 2019 22:43:18 +0200 Message-Id: <20190525204319.28977-5-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190525204319.28977-1-sam@ravnborg.org> References: <20190525204319.28977-1-sam@ravnborg.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E+IbTkqQdZIcyZ+fBbhT4Ah4Mh1U2qaUUK0vC3RuDmc=; b=oYJxpJ8FkfGorV9so39ERQ6Pvp+mS9GNCHhxIc6LZGyBJVCIsp7Uksfb7LqdmachUZ FcG91Ualpj78BwVZvioSMV5+QoweKTbxJFuWiQJSYWEK/cCII4Hfy8rrd83yTBERImlO 9eQQhPd/RIpwVwdtMRX47AEfdvSLI4SbIWBvpU6T4nFkAAIIHQ1Ep1aoO23yBd0vWPGZ zbnAZ7mcux0NTx1/csPyc4tt2xhBfVVJP4Lej2QY6ukNI8ckNtNiVxzb9yvRHEr/vCaO fhgyH1+iun8NKxGcMEw5UgGPK4Qw8VgFAjn4wKHX8ae+cqBVQjbZbp/r1RVmk9b2pCdz FOFw== Subject: [Intel-gfx] [PATCH v3 4/5] drm/gma500: drop use of DRM_UDELAY wrapper X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, Sam Ravnborg Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The DRM_UDELAY wrapper from drm_os_linux.h is used in a few places, all other places calls udelay() with no wrapper. There is no reason to continue to use this wrapper - so drop it and direct call udelay(). Signed-off-by: Sam Ravnborg Acked-by: Daniel Vetter Acked-by: Patrik Jakobsson Cc: David Airlie --- drivers/gpu/drm/gma500/mdfld_device.c | 4 ++-- drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c index 585ec2e46166..edb9b1bbd6c6 100644 --- a/drivers/gpu/drm/gma500/mdfld_device.c +++ b/drivers/gpu/drm/gma500/mdfld_device.c @@ -344,7 +344,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum) if (pipenum == 1) { /* restore palette (gamma) */ - /*DRM_UDELAY(50000); */ + /* udelay(50000); */ for (i = 0; i < 256; i++) PSB_WVDC32(pipe->palette[i], map->palette + (i << 2)); @@ -406,7 +406,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum) PSB_WVDC32(pipe->conf, map->conf); /* restore palette (gamma) */ - /*DRM_UDELAY(50000); */ + /* udelay(50000); */ for (i = 0; i < 256; i++) PSB_WVDC32(pipe->palette[i], map->palette + (i << 2)); diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c index f0872e2c22d5..2d8afbb51a77 100644 --- a/drivers/gpu/drm/gma500/oaktrail_device.c +++ b/drivers/gpu/drm/gma500/oaktrail_device.c @@ -327,7 +327,7 @@ static int oaktrail_restore_display_registers(struct drm_device *dev) /* Actually enable it */ PSB_WVDC32(p->dpll, MRST_DPLL_A); - DRM_UDELAY(150); + udelay(150); /* Restore mode */ PSB_WVDC32(p->htotal, HTOTAL_A); diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c index c6d72de1c054..797329028439 100644 --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c @@ -815,7 +815,7 @@ void oaktrail_hdmi_restore(struct drm_device *dev) PSB_WVDC32(hdmi_dev->saveDPLL_ADJUST, DPLL_ADJUST); PSB_WVDC32(hdmi_dev->saveDPLL_UPDATE, DPLL_UPDATE); PSB_WVDC32(hdmi_dev->saveDPLL_CLK_ENABLE, DPLL_CLK_ENABLE); - DRM_UDELAY(150); + udelay(150); /* pipe */ PSB_WVDC32(pipeb->src, PIPEBSRC);