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=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 6D25CC6379D for ; Sat, 14 Nov 2020 00:15:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 297432225D for ; Sat, 14 Nov 2020 00:15:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eP3kvHHh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726313AbgKNAPH (ORCPT ); Fri, 13 Nov 2020 19:15:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49778 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726088AbgKNAPC (ORCPT ); Fri, 13 Nov 2020 19:15:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605312901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YEUE8BEt/HHRBsioHGD0oe9yvnlWjkF4Cv9LZW4QV9w=; b=eP3kvHHhSpZlJue5sZ0VXKazCnHTyRjcufWkhjxyi7UTF5kYIqzN7E6+iYT9s1ZSod9Jt/ UnTC2HrtfTofunrG1bceW+fBWDK4c+mNUO+FM3v5pWO/FeVKCzUUBstTEwbOEXgbAwiV25 mwmwxM8W9JVPDUgM0l9weRm+khrhMrM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-vosWtSBlOlO7ntrw3MStZw-1; Fri, 13 Nov 2020 19:14:59 -0500 X-MC-Unique: vosWtSBlOlO7ntrw3MStZw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2FBF85C70F; Sat, 14 Nov 2020 00:14:57 +0000 (UTC) Received: from Whitewolf.lyude.net (ovpn-115-66.rdu2.redhat.com [10.10.115.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8D6760C15; Sat, 14 Nov 2020 00:14:56 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org Cc: Ben Skeggs , David Airlie , Daniel Vetter , Dave Airlie , Alex Deucher , Pankaj Bharadiya , Takashi Iwai , James Jones , nouveau@lists.freedesktop.org (open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 7/8] drm/nouveau/kms/nv50-: Use nouveau_encoder->crtc in get_eld callback Date: Fri, 13 Nov 2020 19:14:16 -0500 Message-Id: <20201114001417.155093-8-lyude@redhat.com> In-Reply-To: <20201114001417.155093-1-lyude@redhat.com> References: <20201114001417.155093-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org drm_encoder->crtc is deprecated for atomic drivers, but nouveau_encoder->crtc is safe. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 63fff3988f19..b19d0d7a6de9 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -630,7 +630,7 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id, if (!nv_connector) continue; - nv_crtc = nouveau_crtc(encoder->crtc); + nv_crtc = nouveau_crtc(nv_encoder->crtc); if (!nv_crtc || nv_encoder->or != port || nv_crtc->index != dev_id) continue; -- 2.28.0