From patchwork Thu Jul 18 16:15:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049325 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 3F18314F6 for ; Thu, 18 Jul 2019 16:17:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B7982874B for ; Thu, 18 Jul 2019 16:17:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F5BB28802; Thu, 18 Jul 2019 16:17:41 +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_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B89A82874B for ; Thu, 18 Jul 2019 16:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RKstoux0/q9ZOeSQD3pH+CEOyfscoaMW16SbSFAX8Xw=; b=kQALXE/6g294bv 0NITaqFwq37GloHJAHcBjZI/aX/jYfMKR4d23TAiBj9qMtW3hrl9Hfp2SfYnO9+kunGSIuEJ3gJKc DtodZyToWCNj/JRd9b6YWwDNPGSnIWdQPyTp10Ux/UtPR3LTjiaTG+t1RdjRN6Zwh79L3h9aJVZns eSAOIZBp/r7TnyGMg10Ijc3RFeDFJ9erTHW5KJhNFUr4kxWiI18/dhW2qW5ugV1qrGVSUYYQqWOJL kBMlpzugXMZp+M99MXULC3pD6CLDbgbR+eVUA8qHKuAn4ypBV71Eb8BbPZGTxa6UfruvpDWDrGSq4 8jwED2/duYWgaEvibggw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho96C-00021p-7i; Thu, 18 Jul 2019 16:17:40 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho948-0007og-8V; Thu, 18 Jul 2019 16:15:34 +0000 Received: by mail-lf1-x141.google.com with SMTP id b17so19642962lff.7; Thu, 18 Jul 2019 09:15:32 -0700 (PDT) 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=TBzEtdfCBC7JeGboomJdNlsAe05PLJaxt5wvtDjrcuc=; b=rCmwKJR0Ch/XIKuvX/iHVKTyWuto858/ULPTJNZuoxCPXol4vTi8kjxj+OdaXRHT2p 6X2P9wZze0CqOaL4cU4Fu+dF5nzao2U+If/3C1Ki+1MGinO/FNJEwAznmWmf3mgwZopF cjQJhUjrAaTQ7iESM5EOl8nbtN5Kd82P/bCbjr9z/u0JOwcVUoQoGQeIsjyTbQwtPb8x rzCup7ZkSowfDduPVWmrzvT/m59PrUV7GE6LkJD8zixS/9mAKNe5A+RJhaj0lUXzlkhN 2V+r1O1M7tPiHg09aIT6VLwMqOplw0dPGxu03kCzU5Too4xcj+CwW98qLmBs2roVk8GE 0sJQ== 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=TBzEtdfCBC7JeGboomJdNlsAe05PLJaxt5wvtDjrcuc=; b=nv+u+QQFKgFAOw7sASK+mCjyuXZYZrPB9mFQ2wE8Vgqf9iBmQemcmdD0Z4QIXwHWRC i95M+cM2HIXwO+auvh/ngBH1D+I9K7BjQj8MsD9W4ITCXFMUkhXeOYgDaJfUPy1XKaSa nc51GY+3Yewz42sYKIMkxENkXVEggtbAM/C5NWFy9pdcyaDinxdcOnIdrE4qZqUdy2Sq W0l9bJzSVA2Fi3001PgguAq0rF2sx8i+brIOQX72BeqFI5C0I0JIsJZ3+nCsj//sHQvy H8TkiYYNMAlKfO4wW/nOJOU/RxdykTueIaLoE6YGmVanpuX4gWN13ArhAo0dt3YLiPCy Mfrw== X-Gm-Message-State: APjAAAV96MK+F/CY4pkZJLW5Ha529h13ldY2wevYnLGBOQq+q50z10Oi wIz3YXOXERaApc81/skJ/iU= X-Google-Smtp-Source: APXvYqxR6UJvyzBrpoBKJ1t/MeC7+3uFD4fwDUCOIFsQ9De/62GDc97lhKJZ2LBIEMtYzSPi07yrWA== X-Received: by 2002:ac2:5a01:: with SMTP id q1mr7852749lfn.46.1563466530686; Thu, 18 Jul 2019 09:15:30 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id d21sm4057995lfc.73.2019.07.18.09.15.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:30 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 04/11] drm/ati_pcigart: drop dependency on drm_os_linux.h Date: Thu, 18 Jul 2019 18:15:00 +0200 Message-Id: <20190718161507.2047-5-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190718161507.2047-1-sam@ravnborg.org> References: <20190718161507.2047-1-sam@ravnborg.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091532_365784_5A62F7A9 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The drm_os_linux.h header is deprecated. Just opencode the sole DRM_WRITE32(). Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Sean Paul --- drivers/gpu/drm/ati_pcigart.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 2a413e291a60..580aa2676358 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c @@ -35,7 +35,6 @@ #include #include -#include #include #include @@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga page_base = (u32) entry->busaddr[i]; for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { + u32 offset; u32 val; switch(gart_info->gart_reg_if) { @@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga break; } if (gart_info->gart_table_location == - DRM_ATI_GART_MAIN) + DRM_ATI_GART_MAIN) { pci_gart[gart_idx] = cpu_to_le32(val); - else - DRM_WRITE32(map, gart_idx * sizeof(u32), val); + } else { + offset = gart_idx * sizeof(u32); + writel(val, (void __iomem *)map->handle + offset); + } gart_idx++; page_base += ATI_PCIGART_PAGE_SIZE; }