From patchwork Fri Nov 16 18:42:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10686855 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 3A33F17EE for ; Fri, 16 Nov 2018 18:44:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CAE32895F for ; Fri, 16 Nov 2018 18:44:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2119528E12; Fri, 16 Nov 2018 18:44:19 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 7C0F928A31 for ; Fri, 16 Nov 2018 18:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729377AbeKQE5t (ORCPT ); Fri, 16 Nov 2018 23:57:49 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:36899 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729497AbeKQE5t (ORCPT ); Fri, 16 Nov 2018 23:57:49 -0500 Received: by mail-yw1-f66.google.com with SMTP id r199so2832976ywe.4 for ; Fri, 16 Nov 2018 10:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zFQ9UWUafA7o4FLJWPnppVG2SZtLozzOSWjEqQWUayE=; b=XdXZQ1XxcunqyVPFohDYLEvvg9AaBaaLEqljU2ymMOKI0xdUlb87qiRcslL0j0OZ24 EpJ6qGMKRJaGrx5dO2mUYiSv4GPQDu5l8Wc1m52M/lxL8/4l+a9CEjiwOAintOOrIv/k Cc4pWlAoW3V/QeaeSiK6zU5Eh9/gjrnxoB+ONtAFRTEhkqz647XNdGZ8TlrgQV7hl5ej TgMssvOhdXZ9lCWSjpxE+r4n9XSdiJMftX4d79VSKi9OsqUPGw3QQ1XVZHMYNEJTaBLJ U+BKTzaxygOZvuH/STDd1twp9EJePbreWtR5MLgZSWTPZ8UDvKB8wBgNL7NXGSzykp61 J2hA== 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=zFQ9UWUafA7o4FLJWPnppVG2SZtLozzOSWjEqQWUayE=; b=nWviJr4fBjG4RBRgGxRmJfBWiCqNVtw0b1SfofqI+67j6oDbhVImg4sqfszz3IaSnY KliBc6iY25Aa8fRKbl0+y/DVz6EZ5VmsAZdlcgOMElFY6B6vEoBEryVe36Cdnuejk+AY wO1H7QbnSjWJJJUeexIksfZYSVNHeTf80498AbvmDSBdu9jvgXF/TYPiTjhtaXp00R8p Bti0EMsAc92uUUOvBQFNRpoOAlXXcTbniUamRoBjaNNsUBJtfvC2fxqgjybuTcCYHbSZ fvxKK8a025BNzVYKny9U0Lre6c59UrYwlmpKxuWwyq2lf0i2cXyZjSyJY9IkyyHN+6Xe paLw== X-Gm-Message-State: AGRZ1gIk0pYMZjzYwfAHvH4B5DlEfdHH9CLxcsxzgT6pHxd+F6OpfPsB HdTd0KuMmTqzyao7qLBWLIGpxg== X-Google-Smtp-Source: AJdET5c0/MLPXHX0b4IId/YDY9R+3Tf+P+rsMrRBWQPH+GVOSH+nPq8DgM9rTVVvVQ73gE1cxD6ubQ== X-Received: by 2002:a0d:ca43:: with SMTP id m64mr11768350ywd.145.1542393856910; Fri, 16 Nov 2018 10:44:16 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id b144sm5359134ywa.33.2018.11.16.10.44.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 10:44:16 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: robdclark@gmail.com, jsanka@codeaurora.org, Sean Paul Subject: [PATCH v2 20/24] drm/msm: dpu: Use atomic_disable for dpu_crtc_disable Date: Fri, 16 Nov 2018 13:42:30 -0500 Message-Id: <20181116184238.170034-21-sean@poorly.run> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog In-Reply-To: <20181116184238.170034-1-sean@poorly.run> References: <20181116184238.170034-1-sean@poorly.run> MIME-Version: 1.0 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: Sean Paul Matches dpu_crtc_enable and we'll need the old state in a future patch Changes in v2: - None Signed-off-by: Sean Paul Reviewed-by: Jeykumar Sankaran --- 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 4d7f9ff1e9f4..9efb41c7973b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -815,7 +815,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; @@ -1407,7 +1408,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,