From patchwork Tue Nov 29 20:33:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clint Taylor X-Patchwork-Id: 13059151 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 23EDEC4332F for ; Tue, 29 Nov 2022 20:38:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1144C10E100; Tue, 29 Nov 2022 20:38:00 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 04DE110E100 for ; Tue, 29 Nov 2022 20:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669754276; x=1701290276; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=2DEsDUq/6dzRjX2/jqgnXsRrEtNPK3AvNMe4HsL/2XE=; b=SLSKkKBxI6GlbUoIFPlAdfI9zdotr6aCEI25T2/8yDKAlB0g21fp8tm0 HJIsYo6BMTes+EJC2nFsRCDIPSeLuiy5V+WgBHro7Gai11soH0zv56Wxn k4qdv8dyNchYqfqLjrt7JlAihkkLtdzDdqwdRSU7hOqFfVebh7lY8k2at kudSK3+1E+8qPlyFaSh7YEW5aHHQ1WBxyyZwJ+P3r779OK7g7vLJGHw1V hiD7GByAG9KX2F9OdAyJsJ0rFY3Dn0ucfJSuIAo+TQHX+Ldz1QxgWh2bj k52SKOaZJxypRVzu3fZPtxL/lZW+bwPc1MJYcxPmKIy4fhC90r9t3moK/ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="316377406" X-IronPort-AV: E=Sophos;i="5.96,204,1665471600"; d="scan'208";a="316377406" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2022 12:37:55 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="707374034" X-IronPort-AV: E=Sophos;i="5.96,204,1665471600"; d="scan'208";a="707374034" Received: from cataylo2-desk.jf.intel.com ([10.165.21.136]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2022 12:37:54 -0800 From: "Taylor, Clinton A" To: Intel-gfx@lists.freedesktop.org Date: Tue, 29 Nov 2022 12:33:43 -0800 Message-Id: <20221129203343.720860-1-clinton.a.taylor@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v4] drm/i915/hdmi: SPD infoframe update for discrete X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Replace integrated with discrete for dgfx platforms. v2: commit title reword (Jani) v3: use variable name i915 (Jani) v4: commit message reword (MattR) Cc: Jani Nikula Reviewed-by: Matt Roper Signed-off-by: Taylor, Clinton A --- drivers/gpu/drm/i915/display/intel_hdmi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index bac85d88054f..e82f8a07e2b0 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -767,6 +767,7 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd; int ret; @@ -776,7 +777,11 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD); - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); + if (IS_DGFX(i915)) + ret = hdmi_spd_infoframe_init(frame, "Intel", "Discrete gfx"); + else + ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); + if (drm_WARN_ON(encoder->base.dev, ret)) return false;