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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A299CEB64DC for ; Fri, 21 Jul 2023 16:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231624AbjGUQQr (ORCPT ); Fri, 21 Jul 2023 12:16:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232045AbjGUQQ3 (ORCPT ); Fri, 21 Jul 2023 12:16:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F5743599 for ; Fri, 21 Jul 2023 09:15:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1D8D861D2F for ; Fri, 21 Jul 2023 16:15:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30412C433C7; Fri, 21 Jul 2023 16:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689956132; bh=UOC4YaUSp80zDPImaHYO9dyBUubaKOKNwNkGhjaZnds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1ktCm3Hjam9NblzJ3hQH7OxhFZyTW4vlMEWjjYOb0ddvkyHW9D2eaIOH1zvM5J3va xEWjuuYT0x1o5K2rmzqGMN/DDe/wAgRwzp+ISlrsDyhSuhcqO49T9aX0svLYYzwGg3 J6uItrbUBCk+l8me7DzEnrKNVYyxWLl75l2a5qPA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ben Skeggs , Lyude Paul , Karol Herbst , Sasha Levin Subject: [PATCH 6.4 098/292] drm/nouveau/disp/g94: enable HDMI Date: Fri, 21 Jul 2023 18:03:27 +0200 Message-ID: <20230721160533.008045537@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721160528.800311148@linuxfoundation.org> References: <20230721160528.800311148@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Karol Herbst [ Upstream commit c177872cb056e0b499af4717d8d1977017fd53df ] Cc: Ben Skeggs Cc: Lyude Paul Fixes: f530bc60a30b ("drm/nouveau/disp: move HDMI config into acquire + infoframe methods") Signed-off-by: Karol Herbst Reviewed-by: Ben Skeggs Link: https://patchwork.freedesktop.org/patch/msgid/20230630160645.3984596-1-kherbst@redhat.com Signed-off-by: Karol Herbst Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c index a4853c4e5ee3a..67ef889a0c5f4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c @@ -295,6 +295,7 @@ g94_sor = { .clock = nv50_sor_clock, .war_2 = g94_sor_war_2, .war_3 = g94_sor_war_3, + .hdmi = &g84_sor_hdmi, .dp = &g94_sor_dp, }; -- 2.39.2