From patchwork Thu Jun 28 18:29:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10494719 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 83ABC60230 for ; Thu, 28 Jun 2018 18:29:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A9212A762 for ; Thu, 28 Jun 2018 18:29:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F2C92A782; Thu, 28 Jun 2018 18:29:28 +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 893942A762 for ; Thu, 28 Jun 2018 18:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030483AbeF1S3Y (ORCPT ); Thu, 28 Jun 2018 14:29:24 -0400 Received: from mail-yb0-f194.google.com ([209.85.213.194]:33257 "EHLO mail-yb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966642AbeF1S3V (ORCPT ); Thu, 28 Jun 2018 14:29:21 -0400 Received: by mail-yb0-f194.google.com with SMTP id e84-v6so2387248ybb.0 for ; Thu, 28 Jun 2018 11:29:20 -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=eYAWB0DiW9zuMdt+BHu+T8YWypEgEO0YYrJ0T9zpLLY=; b=OqqYfsJ4+S+oodZgNydJmiX9tsmz67EtRRnEBtP8rj7Mu+54ks7qSTLKIZ1dC+a7eD Ato44e7jVfhpcuamp0+v6kwcA7QrRSY+0OO3j/xCmXG31SBqFfn5C+L/rXlXjoqgJst8 49HUh9nd9SdyCfl2nMXa8ebRcCU29Rjr4Wr28= 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=eYAWB0DiW9zuMdt+BHu+T8YWypEgEO0YYrJ0T9zpLLY=; b=qChOwoKuHpU3GPZkBSwEsUQ5of3UUaSn4PFT+QDv5/HDTRJ694MGf5IpzUoFlUkJ0x eY5xha+tw+cC0gukr2hVkyOMvMZIpPbi4Skrwur7iCVPVhi2UQStbluNlsOimUJy6/EJ zPfZT4XeTqGz04gbxSCjoQsyfmadMZNxglaDm5qkiK8DQ5iNihD9cWiYhhbJ71hC3AEN FAPGqTG6S0c81h2dxsgIrT79dIJwJJD4NlqMDx9NKuIQhKGpOD5JEFZhMzrYQNrSgWQ2 gWG7MSHY1eizf1FQoKpSzhmNTu0SMayZAIDABeY4Yt1HjKdt5/GsXAgztBiKTA5AC4PK b+kA== X-Gm-Message-State: APt69E39xxfKHcHNNyJn4fL/Dp+6kewor7dAKnuTiHFQBrbH5SjWjuF6 UIAi+XaoOrUOMce/Ey4uQpRbFg== X-Google-Smtp-Source: ADUXVKKSjwNF+FTM2RJONeQb4x9MWkDqR9aujhPWeg8j1MmfDz+gbboNJ6/0j7PsXN8dW7eVssBP6A== X-Received: by 2002:a25:264b:: with SMTP id m72-v6mr6067821ybm.301.1530210560566; Thu, 28 Jun 2018 11:29:20 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id g145-v6sm2732140ywe.17.2018.06.28.11.29.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 11:29:20 -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 14/15] drm/msm: Remove atomic_check() from msm_kms Date: Thu, 28 Jun 2018 14:29:05 -0400 Message-Id: <20180628182906.84926-15-seanpaul@chromium.org> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: <20180628182906.84926-1-seanpaul@chromium.org> References: <20180628182906.84926-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 never called since we use the atomic helpers Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 26 ------------------------- drivers/gpu/drm/msm/msm_kms.h | 3 --- 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 edb5d40f9160..4011525e1d7e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -773,31 +773,6 @@ static void dpu_kms_preclose(struct msm_kms *kms, struct drm_file *file) dpu_crtc_cancel_pending_flip(priv->crtcs[i], file); } -static int dpu_kms_atomic_check(struct msm_kms *kms, - struct drm_atomic_state *state) -{ - struct dpu_kms *dpu_kms; - struct drm_device *dev; - int ret; - - if (!kms || !state) - return -EINVAL; - - dpu_kms = to_dpu_kms(kms); - dev = dpu_kms->dev; - - if (dpu_kms_is_suspend_blocked(dev)) { - DPU_DEBUG("suspended, skip atomic_check\n"); - return -EBUSY; - } - - ret = drm_atomic_helper_check(dev, state); - if (ret) - return ret; - - return 0; -} - static int dpu_kms_pm_suspend(struct device *dev) { struct drm_device *ddev; @@ -962,7 +937,6 @@ static const struct msm_kms_funcs kms_funcs = { .enable_vblank = dpu_kms_enable_vblank, .disable_vblank = dpu_kms_disable_vblank, .check_modified_format = dpu_format_check_modified_format, - .atomic_check = dpu_kms_atomic_check, .get_format = dpu_get_msm_format, .round_pixclk = dpu_kms_round_pixclk, .pm_suspend = dpu_kms_pm_suspend, diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index e275cc42ecd3..93e46d75bf56 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -60,9 +60,6 @@ struct msm_kms_funcs { const struct msm_format *msm_fmt, const struct drm_mode_fb_cmd2 *cmd, struct drm_gem_object **bos); - /* perform complete atomic check of given atomic state */ - int (*atomic_check)(struct msm_kms *kms, - struct drm_atomic_state *state); /* misc: */ long (*round_pixclk)(struct msm_kms *kms, unsigned long rate, struct drm_encoder *encoder);