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: 10471449 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 EB4AD6032A for ; Mon, 18 Jun 2018 13:33:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA8D3286D7 for ; Mon, 18 Jun 2018 13:33:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF0492880D; Mon, 18 Jun 2018 13:33:49 +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 5E09E286D7 for ; Mon, 18 Jun 2018 13:33:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934167AbeFRNds (ORCPT ); Mon, 18 Jun 2018 09:33:48 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:39468 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933585AbeFRNds (ORCPT ); Mon, 18 Jun 2018 09:33:48 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A95B860227; Mon, 18 Jun 2018 13:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529328827; bh=8lwEa1YiEhQeafbh5t6YoMYfAvuqxYW19Sxirw3z8Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N/B56nPrx+nMTCZnI+4nIVzzddmbNaDQVbC4v0SK+95AZmQ6BC1Ag4/R1/6Gq5AiM 0mfeoCLno2/nhKKjeX0M1ND5ZpELegBuwwFId595NZOAWuYUQ4zwP+yu7hpB1yhpGx VLdvdOsH9DkIiUM83fYeXO8EIn1fs/C46w9cJwII= 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529328826; bh=8lwEa1YiEhQeafbh5t6YoMYfAvuqxYW19Sxirw3z8Vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=joEfiJvg87VI10ncVvSJrnYGICfR4I4wiwQM0DoRn2CwEF6NGUgCDGLYkxPRT0dUd LytE+EDaoGMUug6n4TpP+ibzdI5/m6/IYYjShjKes+8/eZ4BHN5uiIvy4sZ4HJZ01q ODzQ0Eu5SYK0FCZ5IQp8HcEvizxLwucaxeMJ/9PA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5DF0D60B24 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=skolluku@codeaurora.org From: Sravanthi Kollukuduru To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Cc: Jeykumar Sankaran , robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, Sravanthi Kollukuduru 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> 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 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