From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A078C7618F for ; Mon, 22 Jul 2019 18:20:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61CC221985 for ; Mon, 22 Jul 2019 18:20:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="ak5c6nSt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731459AbfGVSU2 (ORCPT ); Mon, 22 Jul 2019 14:20:28 -0400 Received: from mail-yb1-f195.google.com ([209.85.219.195]:46175 "EHLO mail-yb1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726604AbfGVSU1 (ORCPT ); Mon, 22 Jul 2019 14:20:27 -0400 Received: by mail-yb1-f195.google.com with SMTP id a5so15272102ybo.13 for ; Mon, 22 Jul 2019 11:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=i9YD5G8HAMrMrwipZFF5d7e55WgOTsCxcFVl1IuaGhA=; b=ak5c6nStqCuj2CKoFKbZr8QeS33wn5Tkzs0ZNi0q36+RLFltvOc0xeXTsHIz3N4UPk QJOy5ScCXwQm/3oHhiQaIpuojW2iEccYAtg35XNPm0ZlLjgw08ka4xl+NLI1yhxGKvRH j6vEXEAz/p4xsMvBZEflj7DTIX37B05LXzhVk58xGpC2nt+tKbMV5UO2QYXFtxADJcTZ 0YUjHcpfFssACDyQZD2Pd2K9Emq+rQPEcUhyFCuwv4gM4l86SpyIiOzB215sShGcxpA7 UtSy4Bplog61zuI3HZX5BnDFxnRFYGq7e2dGsnSFlTGpuk5PKHBcWBEOq9v/k1WxPReP E+rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=i9YD5G8HAMrMrwipZFF5d7e55WgOTsCxcFVl1IuaGhA=; b=rWWm1TsLCbaeOs3iM9omv/TIvnrHr5njdufmktekdrxgZxKyJQea1Fuslra0/qKAQ/ ViBJUu1gczMjUuCv68KWpCpuODyh7jC7EwU3UkTTuJHqCHn5i0mPnAcjcy3DmvZbtH8h Niafu214pyuACkm2eG8sgViL87WNUKgNC5j8dd//s9PDB/V/iwz5uEO404EK/AiORgFy l4I/tBPuYmG0uo6bXNkU8rR8nw75VOtM7DaiSUx9S/bcJDHeKEEXmtAkjS0Dge3PKg6I PKxnsI3doUF+9s1RUxYlm6wlwYH7z7KqvJzY59ws26GDZJCJ7VTK3hs6Cz5CBn2zxa+x nNFw== X-Gm-Message-State: APjAAAU69iTv05j+F5UOGxkYabbcFgLdiAf4CoZuZEml2Y2hQ+Lcs/H/ gW0JpwVxvZi9Y+ACaGpPmVqJQw== X-Google-Smtp-Source: APXvYqx+kr/znTWvRUNj/wBR92LmePqwvp+IiGg/iAGQJYNSI5XDcmCJwEIZdXRoBik7k6teTSAf5g== X-Received: by 2002:a5b:405:: with SMTP id m5mr45459571ybp.261.1563819626843; Mon, 22 Jul 2019 11:20:26 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id 206sm9444775ywk.44.2019.07.22.11.20.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 11:20:26 -0700 (PDT) Date: Mon, 22 Jul 2019 14:20:25 -0400 From: Sean Paul To: Shubhashree Dhar Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, abhinavk@codeaurora.org, jsanka@codeaurora.org, chandanu@codeaurora.org, nganji@codeaurora.org, jshekhar@codeaurora.org Subject: Re: drm/msm/dpu: Correct dpu encoder spinlock initialization Message-ID: <20190722182025.GF104440@art_vandelay> References: <1561357632-15361-1-git-send-email-dhar@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1561357632-15361-1-git-send-email-dhar@codeaurora.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 24, 2019 at 11:57:12AM +0530, Shubhashree Dhar wrote: > dpu encoder spinlock should be initialized during dpu encoder > init instead of dpu encoder setup which is part of commit. > There are chances that vblank control uses the uninitialized > spinlock if not initialized during encoder init. > > Change-Id: I5a18b95fa47397c834a266b22abf33a517b03a4e > Signed-off-by: Shubhashree Dhar Thanks for your patch. I've resolved the conflict and tweaked the commit message a bit to reflect current reality. Applied to drm-misc-fixes for 5.3 Sean > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 5f085b5..22938c7 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -2195,8 +2195,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, > if (ret) > goto fail; > > - spin_lock_init(&dpu_enc->enc_spinlock); > - > atomic_set(&dpu_enc->frame_done_timeout, 0); > timer_setup(&dpu_enc->frame_done_timer, > dpu_encoder_frame_done_timeout, 0); > @@ -2250,6 +2248,7 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev, > > drm_encoder_helper_add(&dpu_enc->base, &dpu_encoder_helper_funcs); > > + spin_lock_init(&dpu_enc->enc_spinlock); > dpu_enc->enabled = false; > > return &dpu_enc->base; > -- > 1.9.1 > -- Sean Paul, Software Engineer, Google / Chromium OS