From patchwork Thu Feb 17 03:53:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 543356 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp88940imn; Wed, 16 Feb 2022 19:54:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyJhvjhiR4bEbJg+90hIdUqSucFcoPsVextqq6/+/58G6azPOr7m9GN37OA5XNyYDTXpKV X-Received: by 2002:a05:6a00:148b:b0:4e0:1001:1063 with SMTP id v11-20020a056a00148b00b004e010011063mr1276444pfu.15.1645070066877; Wed, 16 Feb 2022 19:54:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645070066; cv=none; d=google.com; s=arc-20160816; b=dBdxx6sU46x9mLdQFmHp6eBS04wz38//E6AYKmD0ui/BduQG7VuHM4183Nf6PDxq/Z N6ImgkOMlcjSY/irWPey1cdD8r+YCgqfJxgB+f8p/zBOdAYALnRx3qEC+n4m8D0d0ClP zk4lQlqCjY9lJWVzFO55XTW3LCXvsyYOSYp6n+4vrkO55NDdmmxy503VDN/Sj6vRI3JX dHA6r6GSo9+ZTc7fPjfg/HQC7iWkibF6lkmcrwxqrIq5EAh1PjmvvvHmh+Q7w61K5S5K rFNE7CjIH5yaXMPlCduNrbYnJ+Vgyjyysls/Oe/CIuUYEi5K+P21olO5GFBBnn19dj88 8v+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=2AdJ+qrckMHTJcRwxA8dkshi8PG6FFViBpmjAV8cCbI=; b=MPAkXzK0B0U/w2m9rqiVASGquZ4bRXySNxVWbBJcrdF4AXmVmDIqJY+XubdLlAf1pf vBLP9UecnSKAAHVZj2tKxRx1Sj+tc3QZIlSHzfRuJ0zgB5XjwPk9vx/e1n5EL+iZitBK u/yjC7TBe/Q3JyXzokHOAU3p0jOtv+bNVRtvqdS8iAL7C9qO4304C4fGXewEiUGyYbcl IgTuLM0TAmi6KewC2R1XxUltrPnE/R1v0b0gsTUGEB/5vu96cMJjKmH5Xn7rtKNrj3XZ CkA7T1uKAdaj9Szw7gMpypA0ZgffZoNLt3q4i+qcDQo4rsZg8J4jddu9l9mq30rmx/2Z wPaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YdeBlsi7; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id x14si6655091pgf.464.2022.02.16.19.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 19:54:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YdeBlsi7; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55DC210E75E; Thu, 17 Feb 2022 03:54:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by gabe.freedesktop.org (Postfix) with ESMTPS id E873210E75F for ; Thu, 17 Feb 2022 03:54:02 +0000 (UTC) Received: by mail-lf1-x131.google.com with SMTP id f37so7545379lfv.8 for ; Wed, 16 Feb 2022 19:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2AdJ+qrckMHTJcRwxA8dkshi8PG6FFViBpmjAV8cCbI=; b=YdeBlsi7Cyzf4Eq7wBVPnTETdHlYz6euXzIFkcUr+cR2wdgIgI1YnhPQVMwj0VQQa4 FZezexG9HiA/r7U7Wrbfo6UVTtfPfAh085oHq0rKVj0zyfhCZvbpGlE60CQccHo8tTNg GVvT0+k93R5zSgbiwBcte3drWUZwyPfCQMGiLYxXLwHX5W7kg0gfrPO3YllduuEmZNWJ Uyfvl4gPmNpii/3+gmD677VfDLTvosb/dxY03SWkMBEbjjrr27jutKebs0vCzpkMmoDl uFAjzc1S1IPfxOGfpAQEfx/1EwCRz/NphQB/n9xYAUMm4eimR5wddnZFGWvwzA7cFA7S Bavw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2AdJ+qrckMHTJcRwxA8dkshi8PG6FFViBpmjAV8cCbI=; b=blXwtGSQkImxQ3WmXgo1zwNA93tTcZDLYcM1XyHiYu0LP8Ge5i2J/T+/T2kQJjIN09 p4d7K4IkXX56gcSkXCdLak6mr+dz2kPuhmRlOt25kZUdE9U21AN4b4jUckxzFY47Yuly uG2NuM+gmKUV6ycgZ/Uo+Xmn2iEGq0yI5mTYUaN3QJkjAfG4xdAGktlWiZqELBvD7vER K06dqNgq+RLEoTOSEuRVu5HOSTGrK9kpWSLH03h94TDpd6sQFzk1iaIV+KyhSp9vwkI8 /YzXF6OqgkP6OsZ6KeqhinS35E7ErtsfGACTR3e2dMPEFsj1xDvVuzGDzqZ4j1oK1sE4 jUpg== X-Gm-Message-State: AOAM531LL1eZ5Wxrqvpz2PfRDM2MiUBYMauE2ExShFvc1hPf0/dgSesw LiJdq/KCZk4RcDbfQqXuoKbV4ul0B+VoAw== X-Received: by 2002:a05:6512:481:b0:43d:f703:721e with SMTP id v1-20020a056512048100b0043df703721emr803431lfq.55.1645070041209; Wed, 16 Feb 2022 19:54:01 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id h9sm1575454ljb.77.2022.02.16.19.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Feb 2022 19:54:00 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v2 1/7] drm/msm/dpu: fix dp audio condition Date: Thu, 17 Feb 2022 06:53:52 +0300 Message-Id: <20220217035358.465904-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220217035358.465904-1-dmitry.baryshkov@linaro.org> References: <20220217035358.465904-1-dmitry.baryshkov@linaro.org> 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: , Cc: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" DP audio enablement code which is comparing intf_type, DRM_MODE_ENCODER_TMDS (= 2) with DRM_MODE_CONNECTOR_DisplayPort (= 10). Which would never succeed. Fix it to check for DRM_MODE_ENCODER_TMDS. Fixes: d13e36d7d222 ("drm/msm/dp: add audio support for Display Port on MSM") Reviewed-by: Abhinav Kumar Reviewed-by: Bjorn Andersson Reviewed-by: Stephen Boyd Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 1e648db439f9..02d0fae1c6dc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1099,7 +1099,7 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) } - if (dpu_enc->disp_info.intf_type == DRM_MODE_CONNECTOR_DisplayPort && + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_TMDS && dpu_enc->cur_master->hw_mdptop && dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select) dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select(