From patchwork Thu Jun 28 18:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10494711 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 87E9D60532 for ; Thu, 28 Jun 2018 18:29:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CA022A762 for ; Thu, 28 Jun 2018 18:29:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80FB52A780; Thu, 28 Jun 2018 18:29:25 +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 184D52A762 for ; Thu, 28 Jun 2018 18:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030489AbeF1S3X (ORCPT ); Thu, 28 Jun 2018 14:29:23 -0400 Received: from mail-yb0-f195.google.com ([209.85.213.195]:35771 "EHLO mail-yb0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030483AbeF1S3W (ORCPT ); Thu, 28 Jun 2018 14:29:22 -0400 Received: by mail-yb0-f195.google.com with SMTP id x15-v6so2383863ybm.2 for ; Thu, 28 Jun 2018 11:29:21 -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=SrIX36sH4nPRMvmfEhKlOQMeI62dYVmdv6zthGGFd4E=; b=hu2qiYoMU4EgMDkF7Bvfj9GNv8PuUxJPeBZBlAdL9elQRpUzzrYnQ/ThA047BrgZuo r6VJ66eJ76a0XHJtWCxa8mmcOGnTK6C/3+F9t6Awv4NsepTQn9vX31oGLWyOaZqYpIp0 UoRrmQ2S2g7E3gGtsfV86iUO2B2yoyvxkBG78= 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=SrIX36sH4nPRMvmfEhKlOQMeI62dYVmdv6zthGGFd4E=; b=R9EZgierme4/s/OdiD22dK2VpoeBrLd/0dMxsrcT5XbUP47osvCyEMF7PUGAzxYsN8 6tt2NVe9h4UJoMyggTuDGOx2xRPp2P86QSgQMhjkopqw5HN2WCjEGdt6JzAHySiWQLpe DyuYIfArgkXa+XCvxhkKh33GVB5pFp4PhVlIO8Cis/5j5OHwU8fkeJseOA4vulXdvHrg 5daldKcQIsUrjPnwkvQdFyMLgBFUgTCMKMDOWsJCLLDruDFgWUrZhaudRZtgy/TyLUeb 58aEOu4W8R/LQw9bWACEULXB3qwwMZZaTAkG76cJlfvMkH2XLFqB6dxHTdh1oqV59Ua2 9alw== X-Gm-Message-State: APt69E3smJFG1ylp85WJw3mH5ZsQ8BDsm0P9Cz+E06UwGvQHAUBRh0j8 nfJYpy40hKo7qe6WiBGAUEWBrg== X-Google-Smtp-Source: ADUXVKK1EtaW5F/ohF9MOgwVXVAksLOb20OnN5CtbeXzOBY5+sLbRl/mAD4l6soNY0f0Zc2uJLryvA== X-Received: by 2002:a25:d687:: with SMTP id n129-v6mr5759300ybg.113.1530210561336; Thu, 28 Jun 2018 11:29:21 -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.20 (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 15/15] drm/msm: Remove wait_for_tx_complete() from msm_kms Date: Thu, 28 Jun 2018 14:29:06 -0400 Message-Id: <20180628182906.84926-16-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 not called anywhere. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 44 ----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 --- drivers/gpu/drm/msm/msm_kms.h | 3 -- 3 files changed, 51 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 4011525e1d7e..a3bc4c694c0e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -319,49 +319,6 @@ static void dpu_kms_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) dpu_crtc_vblank(crtc, false); } -static void dpu_kms_wait_for_frame_transfer_complete(struct msm_kms *kms, - struct drm_crtc *crtc) -{ - struct drm_encoder *encoder; - struct drm_device *dev; - int ret; - - if (!kms || !crtc || !crtc->state || !crtc->dev) { - DPU_ERROR("invalid params\n"); - return; - } - - if (!crtc->state->enable) { - DPU_DEBUG("[crtc:%d] not enable\n", crtc->base.id); - return; - } - - if (!crtc->state->active) { - DPU_DEBUG("[crtc:%d] not active\n", crtc->base.id); - return; - } - - dev = crtc->dev; - - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - if (encoder->crtc != crtc) - continue; - /* - * Video Mode - Wait for VSYNC - * Cmd Mode - Wait for PP_DONE. Will be no-op if transfer is - * complete - */ - trace_dpu_kms_wait_for_frame_transfer(DRMID(crtc)); - ret = dpu_encoder_wait_for_event(encoder, MSM_ENC_TX_COMPLETE); - if (ret && ret != -EWOULDBLOCK) { - DPU_ERROR( - "[crtc: %d][enc: %d] wait for commit done returned %d\n", - crtc->base.id, encoder->base.id, ret); - break; - } - } -} - static void dpu_kms_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state) { @@ -933,7 +890,6 @@ static const struct msm_kms_funcs kms_funcs = { .commit = dpu_kms_commit, .complete_commit = dpu_kms_complete_commit, .wait_for_crtc_commit_done = dpu_kms_wait_for_commit_done, - .wait_for_tx_complete = dpu_kms_wait_for_frame_transfer_complete, .enable_vblank = dpu_kms_enable_vblank, .disable_vblank = dpu_kms_disable_vblank, .check_modified_format = dpu_format_check_modified_format, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h index 1924c6662362..76efc690cce3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -307,10 +307,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) ); -DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_wait_for_frame_transfer, - TP_PROTO(uint32_t drm_id), - TP_ARGS(drm_id) -); DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_enc_enable, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 93e46d75bf56..6b5535270276 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -48,9 +48,6 @@ struct msm_kms_funcs { /* functions to wait for atomic commit completed on each CRTC */ void (*wait_for_crtc_commit_done)(struct msm_kms *kms, struct drm_crtc *crtc); - /* function pointer to wait for pixel transfer to panel to complete*/ - void (*wait_for_tx_complete)(struct msm_kms *kms, - struct drm_crtc *crtc); /* get msm_format w/ optional format modifiers from drm_mode_fb_cmd2 */ const struct msm_format *(*get_format)(struct msm_kms *kms, const uint32_t format,