From patchwork Sun Nov 15 15:39:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Ser X-Patchwork-Id: 11906449 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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 2394FC2D0E4 for ; Sun, 15 Nov 2020 15:39: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 DDB62223C7 for ; Sun, 15 Nov 2020 15:39:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DDB62223C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=emersion.fr 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 C124589DC0; Sun, 15 Nov 2020 15:39:18 +0000 (UTC) Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEC2089DC0 for ; Sun, 15 Nov 2020 15:39:17 +0000 (UTC) Date: Sun, 15 Nov 2020 15:39:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emersion.fr; s=protonmail2; t=1605454755; bh=dXC3rmPqEFXxolZ/OrEnQPfXC6VMowVzkn8gYuCisNM=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=e8HhJA+1u418hzXEUgeZKlYEVzEbf5fFvJ8SoZvR6JcXrpO7ISg8bS0HBJN9bzof5 nF//VHDm8md8kRojKiV23h36a0QOo3pAcW1GrJC2jtqZhGIkeXwPuSjwvliCymWdJk F6RPBqAlP1f3twLMVaQMRLPNXroprhswxKDqyYzIyydet9r6pb1ppQqhlxUWF8HTOS mduP9JN/qNj5pMPIZQOr9KjhD/KOAsv+CTo8OHp/gQ6TuO1j8yByls6pTTeTZfyBFo 8FuJNDhyRb6mx6bktI/z3IZNdALW+tdf3kwTx1/pmpCxo9tvz4N8n5nzDmIoDWCQSN +CaqPcNooPz8Q== To: dri-devel@lists.freedesktop.org From: Simon Ser Subject: [PATCH] drm: fix oops in drm_atomic_set_crtc_for_connector Message-ID: <7xhyNYrWtzUIt3HNrWfi9iScW0k475RZiKNfF5TbPs@cp4-web-031.plabs.ch> In-Reply-To: <20201115153139.24369-1-chris@chris-wilson.co.uk> References: <20201115153139.24369-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 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: , Reply-To: Simon Ser Cc: Daniel Vetter , Sam Ravnborg , Chris Wilson Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" crtc can be NULL. connector, extracted from conn_state, can't. Fixes: e3aae683e861 ("drm: convert drm_atomic_uapi.c to new debug helpers") Signed-off-by: Simon Ser Cc: Chris Wilson Cc: Daniel Vetter Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg --- 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 9df7f2a170e3..268bb69c2e2f 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -334,12 +334,12 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, drm_connector_get(conn_state->connector); conn_state->crtc = crtc; - drm_dbg_atomic(crtc->dev, + drm_dbg_atomic(connector->dev, "Link [CONNECTOR:%d:%s] state %p to [CRTC:%d:%s]\n", connector->base.id, connector->name, conn_state, crtc->base.id, crtc->name); } else { - drm_dbg_atomic(crtc->dev, + drm_dbg_atomic(connector->dev, "Link [CONNECTOR:%d:%s] state %p to [NOCRTC]\n", connector->base.id, connector->name, conn_state);