From patchwork Mon Jun 18 13:32:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sravanthi Kollukuduru X-Patchwork-Id: 10471451 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 4AE9A6032A for ; Mon, 18 Jun 2018 13:33:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ADAB289D5 for ; Mon, 18 Jun 2018 13:33:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F8D6289E5; Mon, 18 Jun 2018 13:33:53 +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, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CBEB6289D5 for ; Mon, 18 Jun 2018 13:33:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80CDA89EBB; Mon, 18 Jun 2018 13:33:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1FAA89EBB; Mon, 18 Jun 2018 13:33:47 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 88E9460B23; Mon, 18 Jun 2018 13:33:47 +0000 (UTC) Received: from skolluku-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: skolluku@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5DF0D60B24; Mon, 18 Jun 2018 13:33:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5DF0D60B24 From: Sravanthi Kollukuduru To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [DPU PATCH v2 06/14] drm/msm/dpu: remove stale encoder code Date: Mon, 18 Jun 2018 19:02:44 +0530 Message-Id: <1529328772-5022-7-git-send-email-skolluku@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1529328772-5022-1-git-send-email-skolluku@codeaurora.org> References: <1529328772-5022-1-git-send-email-skolluku@codeaurora.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sravanthi Kollukuduru , hoegsberg@chromium.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Jeykumar Sankaran Remove helper function used only by writeback connectors to trigger final flush before disabling. Now that write back connectors are stripped down, the helper is not used. changes in v2: - none Signed-off-by: Jeykumar Sankaran Signed-off-by: Sravanthi Kollukuduru --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 64 ------------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 ---- 2 files changed, 73 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index e98cf70..9f2bd47 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1927,70 +1927,6 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc) DPU_ATRACE_END("encoder_kickoff"); } -int dpu_encoder_helper_hw_release(struct dpu_encoder_phys *phys_enc, - struct drm_framebuffer *fb) -{ - struct drm_encoder *drm_enc; - struct dpu_hw_mixer_cfg mixer; - struct dpu_rm_hw_iter lm_iter; - bool lm_valid = false; - - if (!phys_enc || !phys_enc->parent) { - DPU_ERROR("invalid encoder\n"); - return -EINVAL; - } - - drm_enc = phys_enc->parent; - memset(&mixer, 0, sizeof(mixer)); - - /* reset associated CTL/LMs */ - if (phys_enc->hw_ctl->ops.clear_pending_flush) - phys_enc->hw_ctl->ops.clear_pending_flush(phys_enc->hw_ctl); - if (phys_enc->hw_ctl->ops.clear_all_blendstages) - phys_enc->hw_ctl->ops.clear_all_blendstages(phys_enc->hw_ctl); - - dpu_rm_init_hw_iter(&lm_iter, drm_enc->base.id, DPU_HW_BLK_LM); - while (dpu_rm_get_hw(&phys_enc->dpu_kms->rm, &lm_iter)) { - struct dpu_hw_mixer *hw_lm = (struct dpu_hw_mixer *)lm_iter.hw; - - if (!hw_lm) - continue; - - /* need to flush LM to remove it */ - if (phys_enc->hw_ctl->ops.get_bitmask_mixer && - phys_enc->hw_ctl->ops.update_pending_flush) - phys_enc->hw_ctl->ops.update_pending_flush( - phys_enc->hw_ctl, - phys_enc->hw_ctl->ops.get_bitmask_mixer( - phys_enc->hw_ctl, hw_lm->idx)); - - if (fb) { - /* assume a single LM if targeting a frame buffer */ - if (lm_valid) - continue; - - mixer.out_height = fb->height; - mixer.out_width = fb->width; - - if (hw_lm->ops.setup_mixer_out) - hw_lm->ops.setup_mixer_out(hw_lm, &mixer); - } - - lm_valid = true; - - /* only enable border color on LM */ - if (phys_enc->hw_ctl->ops.setup_blendstage) - phys_enc->hw_ctl->ops.setup_blendstage( - phys_enc->hw_ctl, hw_lm->idx, NULL); - } - - if (!lm_valid) { - DPU_DEBUG_ENC(to_dpu_encoder_virt(drm_enc), "lm not found\n"); - return -EFAULT; - } - return 0; -} - void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h index 15459be..71a037b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h @@ -403,15 +403,6 @@ void dpu_encoder_helper_split_config( enum dpu_intf interface); /** - * dpu_encoder_helper_hw_release - prepare for h/w reset during disable - * @phys_enc: Pointer to physical encoder structure - * @fb: Optional fb for specifying new mixer output resolution, may be NULL - * Return: Zero on success - */ -int dpu_encoder_helper_hw_release(struct dpu_encoder_phys *phys_enc, - struct drm_framebuffer *fb); - -/** * dpu_encoder_helper_report_irq_timeout - utility to report error that irq has * timed out, including reporting frame error event to crtc and debug dump * @phys_enc: Pointer to physical encoder structure