From patchwork Wed Jun 28 21:22:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karol Herbst X-Patchwork-Id: 13296356 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E850BEB64DA for ; Wed, 28 Jun 2023 21:23:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4680910E391; Wed, 28 Jun 2023 21:22:57 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77EEE10E391 for ; Wed, 28 Jun 2023 21:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687987373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35yLjXwmK+JFwMD6kxYKyYPiJnk3z5/P0tWTo/VOF6w=; b=LMsWvE6TuaVskBWM73K6Fb3+d0xHrQXcoCrUMxpM+npyP6pmYsveD5ARxVQ2W4BhwPikBz lsiPSZEBrKMneOH4YB2NxDXrfX80xA9EolEip+yz4IOA34r4WAtU4boWz15AGXluuzXQbM 6eKmAQBDABBDQUSaHjrxmGJ9v2IDBm4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-Ha26TF83MimCicKEvQLhmQ-1; Wed, 28 Jun 2023 17:22:51 -0400 X-MC-Unique: Ha26TF83MimCicKEvQLhmQ-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-313ecc94e23so682f8f.0 for ; Wed, 28 Jun 2023 14:22:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687987370; x=1690579370; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=35yLjXwmK+JFwMD6kxYKyYPiJnk3z5/P0tWTo/VOF6w=; b=Wpaqv2+TDc2nDNwbRCNKVprElEQTktp2A1ckZebrVi0lEMCMob1Bqd8Vx5JhXmrDpB CuAI2WIqxa2nNO6dW8JmT+zGkiRrv64IylLkXwMuPDb2WcAFRqzIWuD6gOxl13gHOShQ a/6F0UC3Mu+n9yTLMFkvO+sSO2yqhf+VHgRbqT4xfjVucfyEvFnHHRGTdm5HRHBQito6 jt+lF+mEhdBhUAR3Lq+Pk+raMOibE4SctTmdJKyUMtBv+wfZC6JMGnW22TPrm7FjEWgQ z7kY0km9RTvcWoPdm1RbLk6kIP43u601nJjm/8GjkyizXuFOQ6GH7SNlOkfEEXT3WjO1 WL5Q== X-Gm-Message-State: AC+VfDwlwFUAalPzNQfBkTBKE6WdvaD6vC9165513Uwz2qn6rlCQR0xC iXOHcmw+MPvN1YKiUgycNbgb+l+p+2q8mDv2Jant8Icl9m/asJyN2OZeottG2O3DeRwiExqQxep a4AuurwuocM4AMPXN1M7zNmdpSPA9 X-Received: by 2002:a5d:688c:0:b0:313:e8fb:b00f with SMTP id h12-20020a5d688c000000b00313e8fbb00fmr12064949wru.6.1687987370472; Wed, 28 Jun 2023 14:22:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4etKwVYGUIIKgW4+xNP19noBx/4crXKmYa7hOdvnL0JSt90wwvxFWoR/KRdnfuAOGnZNBW/g== X-Received: by 2002:a5d:688c:0:b0:313:e8fb:b00f with SMTP id h12-20020a5d688c000000b00313e8fbb00fmr12064938wru.6.1687987370225; Wed, 28 Jun 2023 14:22:50 -0700 (PDT) Received: from kherbst.pingu ([95.90.48.30]) by smtp.gmail.com with ESMTPSA id r3-20020adfda43000000b0030ae3a6be4asm14294323wrl.72.2023.06.28.14.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 14:22:49 -0700 (PDT) From: Karol Herbst To: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] drm/nouveau/disp: fix HDMI on gt215+ Date: Wed, 28 Jun 2023 23:22:46 +0200 Message-ID: <20230628212248.3798605-1-kherbst@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: nouveau@lists.freedesktop.org, Karol Herbst , dri-devel@lists.freedesktop.org, Ben Skeggs Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Cc: Ben Skeggs Cc: Lyude Paul Fixes: f530bc60a30b ("drm/nouveau/disp: move HDMI config into acquire + infoframe methods") Signed-off-by: Karol Herbst --- drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c index a2c7c6f83dcd..506ffbe7b842 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c @@ -125,7 +125,7 @@ gt215_sor_hdmi_infoframe_avi(struct nvkm_ior *ior, int head, void *data, u32 siz pack_hdmi_infoframe(&avi, data, size); nvkm_mask(device, 0x61c520 + soff, 0x00000001, 0x00000000); - if (size) + if (!size) return; nvkm_wr32(device, 0x61c528 + soff, avi.header);