Received: by 10.223.176.5 with SMTP id f5csp349654wra; Tue, 30 Jan 2018 12:32:16 -0800 (PST) X-Google-Smtp-Source: AH8x225mhz635RETWKQUvjFmWdeNdzoENx05pTUS4YIvp7yhr7M4a5rXEbwn+5mDOyJ9tP1b5CxE X-Received: by 10.99.115.82 with SMTP id d18mr24685772pgn.312.1517344336719; Tue, 30 Jan 2018 12:32:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517344336; cv=none; d=google.com; s=arc-20160816; b=IU30DPfvoFmOYD/M++kUs7MGcpPEeH9kz/PloP7WKX3pnmxogYwWtxGg4b22/nPpuJ ugxp8tDjml173zso24gq76dZkwqcVsp+Ad59oP9L7RAw+yawLK622hk/7mZozh/HPHzs IvMFBvvdtv2SEDWUCNCGP6N+DvEwnVs6sVCOL18zRLTyBFE29IqI3E7fCL603QUL6cS8 uoQgp4mVmGw6mjyFVrxF2qb2JdhJA93sL1vOdHHjS8cteLTLPmMCxX85smq628xnge6D G/JeI1jTIxhB5/K8xuoSMZWfXGTKVqNe9HbVlnL/KR4Adz1J6jye/MxWSwjT6WBoP7kb U6xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfert-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=GrSg55xiO5OAdQfaXqpPImzfrjBmKIzfkb6ru4w6AGU=; b=cXIQuxM0NjQ0mIG3T9r3e8PhR5a1Id81TLc2WgG83zRulE+2/o40aGOYfsTH2yOc3n ZOi8CBSj1NGbWrERCAKFkzigB0HdUo8I7gg49/7DbR6VK8LUUz651SpTq1YhPRL+CmN1 RqFiQ5I131dLFozs2UkfHGKGMXzSrfMrTgf5aZ0VJGBnu4vXDWPbG3BQC79XSiWwUkbp wclxtcB/TYHIB8Si/7tl5JoUVUQDe/225SBaPFYk3zImN8Vc7HMiIjqU0Gj5KmcywFZ5 L5uM8oksEuFOd1kCmKFBuHUMnd+tlkagXBe/Vpn8Ag1UwPRL96tLdqU1elYE92xBKvG2 lOYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e3-v6si287040plk.542.2018.01.30.12.32.02; Tue, 30 Jan 2018 12:32:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753152AbeA3UaT (ORCPT + 99 others); Tue, 30 Jan 2018 15:30:19 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:56702 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045AbeA3UaI (ORCPT ); Tue, 30 Jan 2018 15:30:08 -0500 Received: from localhost.localdomain (unknown [IPv6:2a01:e35:8a7e:4790:1865:5d14:35de:d167]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tescande) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 8CEC0274525; Tue, 30 Jan 2018 20:30:06 +0000 (GMT) From: Thierry Escande To: Archit Taneja , Inki Dae , Thierry Reding , Sandy Huang , Sean Paul , David Airlie , Tomasz Figa , Enric Balletbo i Serra Cc: Haixia Shi , =?UTF-8?q?=C3=98rjan=20Eide?= , Zain Wang , Yakir Yang , Lin Huang , Douglas Anderson , Mark Yao , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 43/43] drm/rockchip: psr: Remove flush by CRTC Date: Tue, 30 Jan 2018 21:29:13 +0100 Message-Id: <20180130202913.28724-44-thierry.escande@collabora.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180130202913.28724-1-thierry.escande@collabora.com> References: <20180130202913.28724-1-thierry.escande@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset = "utf-8" Content-Transfert-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tomasz Figa It is not used anymore after last changes and it was not even correct to begin with as it assumed a 1:1 relation between a CRTC and encoder, while in fact a CRTC can be attached to multiple encoders. Signed-off-by: Tomasz Figa Signed-off-by: Thierry Escande --- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 35 ----------------------------- drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 1 - 2 files changed, 36 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c index 1bf5cba9a64d..b1988ac758d5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c @@ -40,23 +40,6 @@ struct psr_drv { int (*set)(struct drm_encoder *encoder, bool enable); }; -static struct psr_drv *find_psr_by_crtc(struct drm_crtc *crtc) -{ - struct rockchip_drm_private *drm_drv = crtc->dev->dev_private; - struct psr_drv *psr; - - mutex_lock(&drm_drv->psr_list_lock); - list_for_each_entry(psr, &drm_drv->psr_list, list) { - if (psr->encoder->crtc == crtc) - goto out; - } - psr = ERR_PTR(-ENODEV); - -out: - mutex_unlock(&drm_drv->psr_list_lock); - return psr; -} - static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder) { struct rockchip_drm_private *drm_drv = encoder->dev->dev_private; @@ -173,24 +156,6 @@ static void rockchip_drm_do_flush(struct psr_drv *psr) mutex_unlock(&psr->lock); } -/** - * rockchip_drm_psr_flush - flush a single pipe - * @crtc: CRTC of the pipe to flush - * - * Returns: - * 0 on success, -errno on fail - */ -int rockchip_drm_psr_flush(struct drm_crtc *crtc) -{ - struct psr_drv *psr = find_psr_by_crtc(crtc); - if (IS_ERR(psr)) - return PTR_ERR(psr); - - rockchip_drm_do_flush(psr); - return 0; -} -EXPORT_SYMBOL(rockchip_drm_psr_flush); - /** * rockchip_drm_psr_flush_all - force to flush all registered PSR encoders * @dev: drm device diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.h b/drivers/gpu/drm/rockchip/rockchip_drm_psr.h index 40e026c14168..860c62494496 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.h @@ -16,7 +16,6 @@ #define __ROCKCHIP_DRM_PSR___ void rockchip_drm_psr_flush_all(struct drm_device *dev); -int rockchip_drm_psr_flush(struct drm_crtc *crtc); int rockchip_drm_psr_inhibit_put(struct drm_encoder *encoder); int rockchip_drm_psr_inhibit_get(struct drm_encoder *encoder); -- 2.14.1