From patchwork Tue Nov 13 20:52:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10681543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12A601747 for ; Tue, 13 Nov 2018 20:53:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 036BA2B537 for ; Tue, 13 Nov 2018 20:53:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC31F2B6D8; Tue, 13 Nov 2018 20:53:22 +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 A7F532B537 for ; Tue, 13 Nov 2018 20:53:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BDF66E3D6; Tue, 13 Nov 2018 20:53:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb43.google.com (mail-yb1-xb43.google.com [IPv6:2607:f8b0:4864:20::b43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A9326E3D6 for ; Tue, 13 Nov 2018 20:53:20 +0000 (UTC) Received: by mail-yb1-xb43.google.com with SMTP id z2-v6so6005518ybj.2 for ; Tue, 13 Nov 2018 12:53:20 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=CisQwFaedQoJAvfuZOz2h5EluFVHXrdWffEeo6TMs60=; b=XNRPxmISlpzXimf42koLPVXOgaK6+2HbOgF6hP0G8bzAl4nMMth85Am8MTBTsoVrH9 o+fiZMv3hsA9XHsxN5/NFk6ZQuGgP9EqD80SZat5vofKb3M3g5TcjptvzQ/49S8PxO/m Uk+ORFQgWsP9pGwAVyDsRXYq1aCbUD0YRPSYG/0kf5Tp0qh4EnUbNZF+5YHlR/7yBFXA kPq4xO/UIZQNV3SjIrVLiOwbfySTrhr8dh7gPWidIRl6Kab8N8jqV4FcopJwe6Vjum8I xFM9U2RsrZ37EUYoRUgcQVPKtUu2hSwSDtPEhxrVT8ElIAKaG9vLn1bIGHFCAkTFK0jd CgIg== X-Gm-Message-State: AGRZ1gKk0kmpqkpPR7YeJ+ZUN6UFcEIbRDRJ5pdMISTi7WuZ33LTIq5G pxXFTyBAoLbnJEgAHa6HtCKN7MTPdVTIDA== X-Google-Smtp-Source: AJdET5eGnXFHhrqaSduuK+DKISQvkZXCkUarOOZ/61VQonLCWHcYIN8G1TiFeCRZ9KAF2kqJIrMmJg== X-Received: by 2002:a25:3794:: with SMTP id e142-v6mr6652237yba.94.1542142399088; Tue, 13 Nov 2018 12:53:19 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id u130-v6sm5441257ywa.71.2018.11.13.12.53.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Nov 2018 12:53:18 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 5/8] drm/msm: dpu: Don't bother checking ->enabled in dpu_crtc_vblank Date: Tue, 13 Nov 2018 15:52:48 -0500 Message-Id: <20181113205257.170707-5-sean@poorly.run> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181113205257.170707-1-sean@poorly.run> References: <20181113205257.170707-1-sean@poorly.run> MIME-Version: 1.0 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: Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul The drm_crtc_vblank_on/off calls in enable/disable guarantee that we won't call this function when crtc is not enabled. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index a4d1a3c98318..4b7f98a6ab60 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1176,9 +1176,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en) mutex_lock(&dpu_crtc->crtc_lock); trace_dpu_crtc_vblank(DRMID(&dpu_crtc->base), en, dpu_crtc); - if (dpu_crtc->enabled) { - _dpu_crtc_vblank_enable_no_lock(dpu_crtc, en); - } + _dpu_crtc_vblank_enable_no_lock(dpu_crtc, en); dpu_crtc->vblank_requested = en; mutex_unlock(&dpu_crtc->crtc_lock);