Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp413308pxa; Wed, 19 Aug 2020 05:09:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkyozuQ1HiMDzSp67UF1SzTPjISok2DrI81kjm/EDs7yLOSkE531bRhSmNNORYeqvc3X/W X-Received: by 2002:a17:906:f2cb:: with SMTP id gz11mr3762703ejb.58.1597838948432; Wed, 19 Aug 2020 05:09:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597838948; cv=none; d=google.com; s=arc-20160816; b=GzXzI8yb4CseGgKud/EXRmzjEdzATnUbzSg/h/PK+QxfbgoTCYsR0FtF6wGvpA92I4 4/occgtSYVT0DVe/ZSlsR5Dwx9ZA80oAvdpo9z6f6nfRL5tTcoPwzYklEOTjOggLo9Rp gfxkX0abQIsVclIL38eqyMJ5x6eR3k9gXyJS0id9xuC4bXEtMeMbPvT44lANJRSzwxqo 4JA9ZAR9pO/SjngYDmmSzQr91QBzPOTjeXQuMcnp90JcWJgIZh781E3MeJyOXaRjg3QN yPx90iBdIk4pdchkoZFB52NCgID3MaV4mcn29ur9tAlQaIwnl2WvSmnYcG5cQrjOHl1w 5R1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ke7U1O4jpsCgyd5tZlylZQ8nSKt7kZ7cf6OiNZ/rmfI=; b=GsFK05qtYIN5q+tHba/7xt54JZY1gSW0LAB2EeMLB3ctSLP09PsP7ssPpGCAiLyKVo Vl+5WbOhePqizCX4p4zdRSjiajw3X5+OZNJ8WnsyghrMYjYoMq/IMtBlVrhjotT+snIh uaImvjgTvmRpZnjZm+hHuWH6FR1OsMraQYXD3POB3+u3RsoGfEM7XYBpQi+DuDBK3mh/ gxQ/vlfqJStqIU7chfI9k5snAdPbxidk4i+dAldttwjieLf0Sdlpt9KcXUGJH6TZALQ3 yI2xJeSS1QTi4BkzGtNfjPAQi9y8XJ+HIuwmiZ4PKn6XeukT2C8bMdCpi0rVdq2B7WEo EC8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="TileK6/o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k19si15332395ejg.29.2020.08.19.05.08.44; Wed, 19 Aug 2020 05:09:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="TileK6/o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728143AbgHSMFu (ORCPT + 99 others); Wed, 19 Aug 2020 08:05:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:46514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728218AbgHSLrn (ORCPT ); Wed, 19 Aug 2020 07:47:43 -0400 Received: from mail.kernel.org (ip5f5ad5a3.dynamic.kabel-deutschland.de [95.90.213.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ADE2922D75; Wed, 19 Aug 2020 11:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597837582; bh=U1Fn6R3HH/nCSOGEI8Nq0OF9Epnu4lU5x3hp5T2IvBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TileK6/o3AqFkzLVtx5iczylaFoJqwGC1tfmpvA2PoRr6hsRwO+q4FnCKsGcLfhRV tecOMMRhwEm0m7Z7zpBHroLLZHKmeRooJN4h45vN2vrufJF1G9Fvk4DGtuaaRFCjwQ pKxudLioPgVDcxiltIqqWJl0XVBo4gFI2/lrv+9w= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k8MXs-00EubL-J6; Wed, 19 Aug 2020 13:46:20 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , John Stultz , Manivannan Sadhasivam , Daniel Vetter , dri-devel , Liwei Cai , Xiubin Zhang , Chen Feng , Liuyao An , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 32/49] staging: hikey9xx/gpu: get rid of iommu_format Date: Wed, 19 Aug 2020 13:46:00 +0200 Message-Id: <22b04b229a090821671eafaec635d4feff205afb.1597833138.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Those aren't needed anymore. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h | 1 - drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1 - drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h index a0f7732063a3..7b9da796a671 100644 --- a/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +++ b/drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h @@ -3087,7 +3087,6 @@ struct dss_hw_ctx { struct iommu_domain *mmu_domain; struct ion_client *ion_client; struct ion_handle *ion_handle; - struct iommu_map_format iommu_format; char __iomem *screen_base; unsigned long smem_start; unsigned long screen_size; diff --git a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h index 84293d2d462e..9c1b62831733 100644 --- a/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +++ b/drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h @@ -4100,7 +4100,6 @@ struct dss_hw_ctx { struct iommu_domain *mmu_domain; struct ion_client *ion_client; struct ion_handle *ion_handle; - struct iommu_map_format iommu_format; char __iomem *screen_base; unsigned long smem_start; unsigned long screen_size; diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h index 261259cb8f5f..54b4ddc2fe42 100644 --- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h @@ -18,7 +18,6 @@ #include #include -#include #define MAX_CRTC 2 @@ -41,7 +40,6 @@ struct kirin_fbdev { struct ion_client *ion_client; struct ion_handle *ion_handle; - struct iommu_map_format iommu_format; void *screen_base; unsigned long smem_start; unsigned long screen_size; -- 2.26.2