From patchwork Tue Nov 13 20:52:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10681537 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 1D56D13BF for ; Tue, 13 Nov 2018 20:53:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3572B5DB for ; Tue, 13 Nov 2018 20:53:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01DA12B6DE; Tue, 13 Nov 2018 20:53:17 +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 B71B92B5DB for ; Tue, 13 Nov 2018 20:53:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C64276E34C; Tue, 13 Nov 2018 20:53:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw1-xc41.google.com (mail-yw1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3F526E3CC for ; Tue, 13 Nov 2018 20:53:15 +0000 (UTC) Received: by mail-yw1-xc41.google.com with SMTP id h32so288594ywk.2 for ; Tue, 13 Nov 2018 12:53:15 -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=qPltI1qrCgJwGI6zSBtcezk2XinRjtKm0e3Db/qEV38=; b=ex9DpY6o3puXMLiBYEvLM0KW8W5d95ooQgVmbqMEnXFE3z55wT+URstZm6Q3Cb+ih3 5xNZ6VJfmN6vh9HpSn1+gRTBMgGFEWS0ODK7yBhRtp+8U0wRiu25Q8CxsfDIR3PegGHX Gw5N1mmPaK8hJ60htEBTeZ3jRL1UmUTCALCXzdt8/2D+4HXySsDC9ncpdKfYftwh6wUb AEGJjhcD6hkYGqcsW7dRUm8nLc8crNUDFohhcT7C71L+CEkwhXcvVr7cy1Ec+2Gzk4ug dSmLC7X+K5Y/9Vhl0nCi6dtZc9cba+6CLaDOZbkNjiMA9Db8ifpR22Q3VWp49xT3shd6 S+PA== X-Gm-Message-State: AGRZ1gJc7CNcL7qGTA2XGogzzyPa3oOgHtaFLXBMgFqwWmeE1vR+6frQ mZKQNJQDfWb0nhvIq05B4OXIUj1NdVr9KQ== X-Google-Smtp-Source: AJdET5dZ2pYtsT4yX/fGZGtElRcJ50UL1jJofnjOqs7cuoXKPzvJ9irCrkPmVRSuP3Hyx9bbb9cZPA== X-Received: by 2002:a0d:ed82:: with SMTP id w124-v6mr6526478ywe.447.1542142394690; Tue, 13 Nov 2018 12:53:14 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Nov 2018 12:53:14 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 4/8] drm/msm: dpu: Use atomic_disable for dpu_crtc_disable Date: Tue, 13 Nov 2018 15:52:47 -0500 Message-Id: <20181113205257.170707-4-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 Matches dpu_crtc_enable and we'll need the old state in a future patch Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 38119b4d4a80..a4d1a3c98318 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -823,7 +823,8 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc) return &cstate->base; } -static void dpu_crtc_disable(struct drm_crtc *crtc) +static void dpu_crtc_disable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) { struct dpu_crtc *dpu_crtc; struct dpu_crtc_state *cstate; @@ -1421,7 +1422,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { }; static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { - .disable = dpu_crtc_disable, + .atomic_disable = dpu_crtc_disable, .atomic_enable = dpu_crtc_enable, .atomic_check = dpu_crtc_atomic_check, .atomic_begin = dpu_crtc_atomic_begin,