| Message ID | 20230731112033.7275-1-yan.y.zhao@intel.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2039085vqg;
Mon, 31 Jul 2023 07:08:29 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlFFUMuUtMzM7ZkacHaaeSa+Uy7jJssYtD1XNnpBcGNR1WOS3D+ydClXPvAiS5rVG6MtSDEy
X-Received: by 2002:a17:902:9f8f:b0:1b8:c1f:fcfc with SMTP id
g15-20020a1709029f8f00b001b80c1ffcfcmr8629368plq.11.1690812508655;
Mon, 31 Jul 2023 07:08:28 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1690812508; cv=none;
d=google.com; s=arc-20160816;
b=pr4aljC9JQEMAtiz/qNwL4/2eKYzAy6U6wpzVliCIwt7Ma5Ix6veGz18CV3AA4j1ld
KqMZfKyxEJ0GKHyRbSzpUvGpthVAAarCURdpWyIi15JpZXWqUc2Qvi29pVanMoeI1Yoz
xyxXIjlkwVO3Ekc7Clc2O8yr47zquCDyLoyOBLjuB+Oz4y2Q9c98V9lRGcOiGyni0cV1
JbsnQWwnefDaIhJMkguqhCUEaFYX2w58UicoR3YrCknTFx3TWc37A2nULdmr1dJnCvB6
GfoG8T0/2rGFdQSm54pTQHWbHSxXB1qe7tg6Pkoq4YmJat70+KaJKIC4pyiPG107qoOA
dE8w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:message-id:date:subject:cc:to:from
:dkim-signature;
bh=xGwwxm9WWpIP8Q/S9y01DyksQJbMHGD6z3+6ypZ8v4Q=;
fh=4sosfAkq52AM2m1PqpD3mlCHHPLdg8D6cj+ztVl0RIg=;
b=vhoXnDVviBZgdeG4RoLmopxrfKQInadie3zWiwBYZa+ElCuEaBbUuMHsFbau+H6WFo
rt7K3ymbOHLDvrEphbuo1fe2ptJhEYqM9TOsW2ReHvaPcqxrr4VmCawJO21wM8dJjcjm
ZyazIAfh00qLFINISJTMhB1Qt3p6k7su0QFsHeGmaOfeH2YBnixfoQCdbTJKiIIUqIv9
Zgt9OyZw2s80Gw9iCOLhtMdu2mPZXuh9aP29HvSHjIscSoAnSiNkjeJqPZB4AyMdnBEO
XqyAUl6JvBlL/UqETKWidRZSk9MvTgiIr5IkuGjQpmIbE+QdQSLnw4HQgQ2ApSya00ec
M0Hw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@intel.com header.s=Intel header.b=bBs2dApM;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
lc12-20020a170902fa8c00b001b3bd85f54bsi3688711plb.35.2023.07.31.07.08.15;
Mon, 31 Jul 2023 07:08:28 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@intel.com header.s=Intel header.b=bBs2dApM;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231549AbjGaLrd (ORCPT <rfc822;dengxinlin2429@gmail.com>
+ 99 others); Mon, 31 Jul 2023 07:47:33 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49450 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231517AbjGaLrb (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 31 Jul 2023 07:47:31 -0400
Received: from mgamail.intel.com (unknown [134.134.136.65])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8BB5E52;
Mon, 31 Jul 2023 04:47:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1690804050; x=1722340050;
h=from:to:cc:subject:date:message-id;
bh=BuF2V2QBl8j3/eWUrzyOnJ939tHmLzmjmmYv3gOvdPY=;
b=bBs2dApMTONX+CQ3cehD3N92FZ9GgielIGlF1RFiPF9lnolkBgYhHf0Q
AtQB5paTaRX6yMojFJ3n4JanHEmExk9cLBl9163a92F46Cv9WNYdxD0O+
/xPaXTR+uECC4PVf5YtfBAyOTJ/OUdu+S5m9J+2Sqd56Z/ZhZyf/MlRzC
GpfV8FszuAeEC1+3zsti6HNRY3qMGDYYt4JdAn3fJB3w3R3oS4xOXYDW4
X9Ou98yW3gat7Ga5L+q5H8snIMPgzowt6NV5D328QVb3ZiadlCBXbYsag
+AHFeTmRjX2fdGePg/4p8dON8QInYC4rYch5WS8UqnpJ1iBrPJ7lv6Utd
A==;
X-IronPort-AV: E=McAfee;i="6600,9927,10787"; a="372624147"
X-IronPort-AV: E=Sophos;i="6.01,244,1684825200";
d="scan'208";a="372624147"
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
31 Jul 2023 04:47:30 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6600,9927,10787"; a="763357271"
X-IronPort-AV: E=Sophos;i="6.01,244,1684825200";
d="scan'208";a="763357271"
Received: from yzhao56-desk.sh.intel.com ([10.239.159.62])
by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
31 Jul 2023 04:47:28 -0700
From: Yan Zhao <yan.y.zhao@intel.com>
To: intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org
Cc: zhenyuw@linux.intel.com, zhi.a.wang@intel.com, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, Yan Zhao <yan.y.zhao@intel.com>
Subject: [PATCH] drm/i915/gvt: Fix bug in getting msg length in AUX CH
registers handler
Date: Mon, 31 Jul 2023 19:20:33 +0800
Message-Id: <20230731112033.7275-1-yan.y.zhao@intel.com>
X-Mailer: git-send-email 2.17.1
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1772945417047616788
X-GMAIL-MSGID: 1772945417047616788
|
| Series |
drm/i915/gvt: Fix bug in getting msg length in AUX CH registers handler
|
|
Commit Message
Yan Zhao
July 31, 2023, 11:20 a.m. UTC
Msg length should be obtained from value written to AUX_CH_CTL register
rather than from enum type of the register.
Commit 0cad796a2269 ("drm/i915: Use REG_BIT() & co. for AUX CH registers")
incorrectly calculates the msg_length from reg type and yields below
warning in intel_gvt_i2c_handle_aux_ch_write():
"i915 0000:00:02.0: drm_WARN_ON(msg_length != 4)".
Fixes: 0cad796a2269 ("drm/i915: Use REG_BIT() & co. for AUX CH registers")
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
---
drivers/gpu/drm/i915/gvt/edid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 2023.07.31 19:20:33 +0800, Yan Zhao wrote: > Msg length should be obtained from value written to AUX_CH_CTL register > rather than from enum type of the register. > > Commit 0cad796a2269 ("drm/i915: Use REG_BIT() & co. for AUX CH registers") > incorrectly calculates the msg_length from reg type and yields below > warning in intel_gvt_i2c_handle_aux_ch_write(): > "i915 0000:00:02.0: drm_WARN_ON(msg_length != 4)". > > Fixes: 0cad796a2269 ("drm/i915: Use REG_BIT() & co. for AUX CH registers") > Signed-off-by: Yan Zhao <yan.y.zhao@intel.com> > --- Thanks for the fix! Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com> > drivers/gpu/drm/i915/gvt/edid.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gvt/edid.c b/drivers/gpu/drm/i915/gvt/edid.c > index 2a0438f12a14..af9afdb53c7f 100644 > --- a/drivers/gpu/drm/i915/gvt/edid.c > +++ b/drivers/gpu/drm/i915/gvt/edid.c > @@ -491,7 +491,7 @@ void intel_gvt_i2c_handle_aux_ch_write(struct intel_vgpu *vgpu, > return; > } > > - msg_length = REG_FIELD_GET(DP_AUX_CH_CTL_MESSAGE_SIZE_MASK, reg); > + msg_length = REG_FIELD_GET(DP_AUX_CH_CTL_MESSAGE_SIZE_MASK, value); > > // check the msg in DATA register. > msg = vgpu_vreg(vgpu, offset + 4); > -- > 2.17.1 >
diff --git a/drivers/gpu/drm/i915/gvt/edid.c b/drivers/gpu/drm/i915/gvt/edid.c index 2a0438f12a14..af9afdb53c7f 100644 --- a/drivers/gpu/drm/i915/gvt/edid.c +++ b/drivers/gpu/drm/i915/gvt/edid.c @@ -491,7 +491,7 @@ void intel_gvt_i2c_handle_aux_ch_write(struct intel_vgpu *vgpu, return; } - msg_length = REG_FIELD_GET(DP_AUX_CH_CTL_MESSAGE_SIZE_MASK, reg); + msg_length = REG_FIELD_GET(DP_AUX_CH_CTL_MESSAGE_SIZE_MASK, value); // check the msg in DATA register. msg = vgpu_vreg(vgpu, offset + 4);