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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B08FAC433DB for ; Tue, 2 Feb 2021 08:38:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4BACD64F55 for ; Tue, 2 Feb 2021 08:38:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BACD64F55 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E6916E8F2; Tue, 2 Feb 2021 08:38:20 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19C106E8F2 for ; Tue, 2 Feb 2021 08:38:19 +0000 (UTC) IronPort-SDR: pShR0/OVtBQhu1KRSPtEZvI8aJAckfwSSH4Tm0G3SfKesn/UMP37Vsg8fYwsI96Ey99JknmMj3 E0Wc0octcqvQ== X-IronPort-AV: E=McAfee;i="6000,8403,9882"; a="244901256" X-IronPort-AV: E=Sophos;i="5.79,394,1602572400"; d="scan'208";a="244901256" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2021 00:38:07 -0800 IronPort-SDR: 25nJEXC6Eo2ZVFdDKTpuj8jByfCWS5snTrgr8nHnDtg3g3y/959Cff7F/5fjVv99ICIGuwBIb0 IVcumXJipUNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,394,1602572400"; d="scan'208";a="391353919" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga008.jf.intel.com with SMTP; 02 Feb 2021 00:38:02 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 02 Feb 2021 10:38:01 +0200 Date: Tue, 2 Feb 2021 10:38:01 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Zhaoge Zhang Subject: Re: [PATCH] drm: Fix drm_atomic_get_new_crtc_state call error Message-ID: References: <1612172024-3556-1-git-send-email-zhangzhaoge@loongson.cn> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1612172024-3556-1-git-send-email-zhangzhaoge@loongson.cn> X-Patchwork-Hint: comment X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tzimmermann@suse.de, airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Feb 01, 2021 at 05:33:44PM +0800, Zhaoge Zhang wrote: > This position is to clear the previous mask flags, > so drm_atomic_get_crtc_state should be used. > = > Signed-off-by: Zhaoge Zhang > --- > drivers/gpu/drm/drm_atomic_uapi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > = > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atom= ic_uapi.c > index 268bb69..07fe01b 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -313,8 +313,8 @@ drm_atomic_set_crtc_for_connector(struct drm_connecto= r_state *conn_state, > return 0; > = > if (conn_state->crtc) { > - crtc_state =3D drm_atomic_get_new_crtc_state(conn_state->state, > - conn_state->crtc); > + crtc_state =3D drm_atomic_get_crtc_state(conn_state->state, > + conn_state->crtc); drm_atomic_get_new_crtc_state() should be fine here since drm_atomic_get_connector_state() will have added the old crtc to the state already. > = > crtc_state->connector_mask &=3D > ~drm_connector_mask(conn_state->connector); > -- = > 2.7.4 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EB44BC433E9 for ; Tue, 2 Feb 2021 08:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A035464F56 for ; Tue, 2 Feb 2021 08:40:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232710AbhBBIkN (ORCPT ); Tue, 2 Feb 2021 03:40:13 -0500 Received: from mga02.intel.com ([134.134.136.20]:39921 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbhBBIjy (ORCPT ); Tue, 2 Feb 2021 03:39:54 -0500 IronPort-SDR: JfMfCd3CYtABHYIj4qpcAY5BmKa1fuQ1Yv0/7Qb1epUMYmx4DYtt4TzcJTbRC69uVwfO2HWqHf qVEp7GXS04Zg== X-IronPort-AV: E=McAfee;i="6000,8403,9882"; a="167926184" X-IronPort-AV: E=Sophos;i="5.79,394,1602572400"; d="scan'208";a="167926184" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2021 00:38:07 -0800 IronPort-SDR: 25nJEXC6Eo2ZVFdDKTpuj8jByfCWS5snTrgr8nHnDtg3g3y/959Cff7F/5fjVv99ICIGuwBIb0 IVcumXJipUNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,394,1602572400"; d="scan'208";a="391353919" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga008.jf.intel.com with SMTP; 02 Feb 2021 00:38:02 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 02 Feb 2021 10:38:01 +0200 Date: Tue, 2 Feb 2021 10:38:01 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Zhaoge Zhang Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: Fix drm_atomic_get_new_crtc_state call error Message-ID: References: <1612172024-3556-1-git-send-email-zhangzhaoge@loongson.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1612172024-3556-1-git-send-email-zhangzhaoge@loongson.cn> X-Patchwork-Hint: comment Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 01, 2021 at 05:33:44PM +0800, Zhaoge Zhang wrote: > This position is to clear the previous mask flags, > so drm_atomic_get_crtc_state should be used. > > Signed-off-by: Zhaoge Zhang > --- > drivers/gpu/drm/drm_atomic_uapi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c > index 268bb69..07fe01b 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -313,8 +313,8 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, > return 0; > > if (conn_state->crtc) { > - crtc_state = drm_atomic_get_new_crtc_state(conn_state->state, > - conn_state->crtc); > + crtc_state = drm_atomic_get_crtc_state(conn_state->state, > + conn_state->crtc); drm_atomic_get_new_crtc_state() should be fine here since drm_atomic_get_connector_state() will have added the old crtc to the state already. > > crtc_state->connector_mask &= > ~drm_connector_mask(conn_state->connector); > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel