From patchwork Thu Jun 28 20:53:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10495217 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A318C60532 for ; Thu, 28 Jun 2018 20:53:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99F992A5A3 for ; Thu, 28 Jun 2018 20:53:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D7382A5AF; Thu, 28 Jun 2018 20:53:42 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BB1D2A5AE for ; Thu, 28 Jun 2018 20:53:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935399AbeF1Uxk (ORCPT ); Thu, 28 Jun 2018 16:53:40 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:47074 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935175AbeF1Uxi (ORCPT ); Thu, 28 Jun 2018 16:53:38 -0400 Received: by mail-yw0-f196.google.com with SMTP id g123-v6so2642481ywf.13 for ; Thu, 28 Jun 2018 13:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jsfjFq8MTQZNp9FihDB9DLAbBsEpy1tn/VW0U84gbDU=; b=UhCoRFq86S+xMCFRiSei6J6hKPJKAvPWKeiM88CS8ALDEKVkmYBAgh5bsaDZKYMCFt NdnsyEiG7bDo2c17GMbKaGMWzeOFaSKDIJVWWYAb9s6/KaGNz0Lsgg6nD9rHehZU8KEP CKjh5AmIq7Ov8rYw3frAGiHogH44ZSE/4GVnw= 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:in-reply-to :references; bh=jsfjFq8MTQZNp9FihDB9DLAbBsEpy1tn/VW0U84gbDU=; b=MTotYEbj0+L8UcKXAEEjFZ0tfDomwKyqSao2YjeBUrDZTGmdZZW4l9D1uYDix/LRwl yzNzdc8TbkiR6C/oXd322x/q4XYcAUWBGrC1AE7NFsaEDofOzXNqQvEBUMVgIPBQN2r4 iif/UM6/rrwjo5krye/WEsoDglikC9032UgaykrzJckja2uFvtT3WUXoou7cPdW1D00n mxe6ZWKmqW+7fnghWpfWigo0sfCh8qguxNpBGSWcTidsNvuyKnmw/R6l6YGKQnvnZRX0 iUVin29eqTfOligZV6vWOcWQB/h+d0KgJmNNX3yuTUpR2suh9P1nnPIqkiQ9PR7myLtL 8cvQ== X-Gm-Message-State: APt69E1isKWsAwIRMJ0uHy1dHuHXGD6Umf+s9ZQarG6qbNAFfheqsER+ l3D81+HDtuyw8/ghPL9Om/9bhw== X-Google-Smtp-Source: AAOMgpe0XQ2wtIxr2XFeV2gCCl1hO12ZKvSZa113b1ZE5WwHNRBJDflmIFVSavmhuCpNDSEdPqwudQ== X-Received: by 2002:a81:4e44:: with SMTP id c65-v6mr1312276ywb.492.1530219218397; Thu, 28 Jun 2018 13:53:38 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id 199-v6sm2982681ywh.95.2018.06.28.13.53.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:53:37 -0700 (PDT) From: Sean Paul To: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: robdclark@gmail.com, hoegsberg@chromium.org, jsanka@codeaurora.org, abhinavk@codeaurora.org, Sean Paul Subject: [DPU PATCH 4/6] drm/msm: Remove ion from dpu Date: Thu, 28 Jun 2018 16:53:32 -0400 Message-Id: <20180628205334.158846-5-seanpaul@chromium.org> X-Mailer: git-send-email 2.18.0.399.gad0ab374a1-goog In-Reply-To: <20180628205334.158846-1-seanpaul@chromium.org> References: <20180628205334.158846-1-seanpaul@chromium.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's mostly gone and won't compile with CONFIG_ION, so remove the remaining pieces. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ------------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ---- 2 files changed, 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 605da85bb53f..fcb94f01d8ad 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -599,15 +599,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) return ret; } -#ifdef CONFIG_ION -static void dpu_kms_set_gem_flags(struct msm_gem_object *msm_obj, - uint32_t flags) -{ - if (msm_obj) - msm_obj->flags |= flags; -} -#endif - #ifdef CONFIG_DEBUG_FS static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) { @@ -657,13 +648,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms) _dpu_debugfs_destroy(dpu_kms); _dpu_kms_mmu_destroy(dpu_kms); -#ifdef CONFIG_ION - if (dpu_kms->iclient) { - ion_client_destroy(dpu_kms->iclient); - dpu_kms->iclient = NULL; - } -#endif - if (dpu_kms->catalog) { for (i = 0; i < dpu_kms->catalog->vbif_count; i++) { u32 vbif_idx = dpu_kms->catalog->vbif[i].id; @@ -1131,15 +1115,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms) } } -#ifdef CONFIG_ION - dpu_kms->iclient = msm_ion_client_create(dev->unique); - if (IS_ERR(dpu_kms->iclient)) { - rc = PTR_ERR(dpu_kms->iclient); - DPU_DEBUG("msm_ion_client not available: %d\n", rc); - dpu_kms->iclient = NULL; - } -#endif - rc = dpu_core_perf_init(&dpu_kms->perf, dev, dpu_kms->catalog, &dpu_kms->phandle, _dpu_kms_get_clk(dpu_kms, "core_clk")); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index f7a3915b2907..407c1ed27fe6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -19,9 +19,6 @@ #ifndef __DPU_KMS_H__ #define __DPU_KMS_H__ -#ifdef CONFIG_CHROME_MSM_ION -#include -#endif #include "msm_drv.h" #include "msm_kms.h" #include "msm_mmu.h" @@ -118,7 +115,6 @@ struct dpu_kms { struct dpu_power_handle phandle; struct dpu_power_client *core_client; - struct ion_client *iclient; struct dpu_power_event *power_event; /* directory entry for debugfs */