From patchwork Mon Jan 18 14:25:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1428184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MTNmLC5M; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKDcB1YFhz9sVr; Tue, 19 Jan 2021 01:26:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l1VTy-0004p3-Nw; Mon, 18 Jan 2021 14:26:14 +0000 Received: from mail-pj1-f50.google.com ([209.85.216.50]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l1VTw-0004nu-0P for kernel-team@lists.ubuntu.com; Mon, 18 Jan 2021 14:26:12 +0000 Received: by mail-pj1-f50.google.com with SMTP id y12so9633694pji.1 for ; Mon, 18 Jan 2021 06:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=beTOUrZsCZy3KqAzfC41araVntPKTB+IQISouRAnNck=; b=MTNmLC5Mdg1yOEZZi1VPeQgAm3pv0G7eMWOxcl4K128GAClQhIssh45UPFU8UL7AtI ArAQzhjgOXN01hggVI3AKcxzd2pFtWwSLNnczgb2NS7JxKOM/TcKeSuxP7tLBsubnsjc 7wKD+Nf/EwuH8p90dNwJ8nW09vETyk8LuEzIaBc7CLSguoxTPIAYPAhxcxMh33V2WFDT GB9HX5ZZa92fZHT0JtKcnAeUzgD7oR4lqCu/OoKQ9I1C+8why9aiyeW+rbjfFw4e7oE2 AkSU51stCn6dxYQvJY+p6DmGn7ODDWCiT9FSUbCf2O5ffoKbllT8CI5QaggO1sGebpma agyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=beTOUrZsCZy3KqAzfC41araVntPKTB+IQISouRAnNck=; b=EMV72WeBUV4A1Oe3k9RXhBjGw1O0wd7TB4/NzYOtUrEM5NqSsRq5kQtnRJbnV0WFKo C0QpCDyuhGxw5NvQi5ry3VCrdRfaWYuOjvvEnYHKX6k+hWA7E4+BGJSpAJWwuJ6SyvBs 4lpeK7mI0YZnLdRZQXHVsO8JpZAXyvodfq+Q1u3VZBUonlCPn1Rcfz6tHk9Sc0p7ri3F 4suazI+pZhEV4RniKz6ELtmc+9RbIcIX+zxNkFteGZo/pXoACKm27KzxtaVuYNkCmkt6 C0MeKtlQr9ll+3NSg8kChHQ97v3neXCOJXhRTI8Y8SC8pyQrbHHlQpc9KvD4gzc0uGc5 H4PA== X-Gm-Message-State: AOAM531GUrkposPFYxgsKxUs1hl5S+yJIyXdp/awjGXchKcTwMQW5BJ8 T0ItV5G7VYnMMEGDegSHGhnD9MGpZjvovQ== X-Google-Smtp-Source: ABdhPJwKW/szswtfaZDXJWJ6kBuWgpr04bLl5S9onRrCmRMS92EoifKH8Yg5kb2D39xtBadjYa2eow== X-Received: by 2002:a17:90a:5a86:: with SMTP id n6mr27314409pji.65.1610979970166; Mon, 18 Jan 2021 06:26:10 -0800 (PST) Received: from localhost (61-220-137-34.HINET-IP.hinet.net. [61.220.137.34]) by smtp.gmail.com with ESMTPSA id b12sm17294089pgr.9.2021.01.18.06.26.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 06:26:09 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/10][SRU][OEM-5.10] Revert "UBUNTU: SAUCE: drm/i915/rkl: new rkl ddc map for different PCH" Date: Mon, 18 Jan 2021 22:25:55 +0800 Message-Id: <20210118142604.207243-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210118142604.207243-1-acelan.kao@canonical.com> References: <20210118142604.207243-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.50; envelope-from=acelan@gmail.com; helo=mail-pj1-f50.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "Chia-Lin Kao (AceLan)" BugLink: https://bugs.launchpad.net/bugs/1909457 This reverts commit 0d2ccb7f5e6cada60453a8273f5d9e74b0b4d868. Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/gpu/drm/i915/display/intel_bios.c | 16 ++-------------- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 -- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 23614a6728f1..390ebff0f1a3 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1598,26 +1598,14 @@ static const u8 icp_ddc_pin_map[] = { [TGL_DDC_BUS_PORT_6] = GMBUS_PIN_14_TC6_TGP, }; -static const u8 rkl_pch_tgp_ddc_pin_map[] = { - [ICL_DDC_BUS_DDI_A] = GMBUS_PIN_1_BXT, - [ICL_DDC_BUS_DDI_B] = GMBUS_PIN_2_BXT, - [RKL_DDC_BUS_DDI_D] = GMBUS_PIN_9_TC1_ICP, - [RKL_DDC_BUS_DDI_E] = GMBUS_PIN_10_TC2_ICP, -}; - static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin) { const u8 *ddc_pin_map; int n_entries; if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) { - if (IS_ROCKETLAKE(dev_priv)) { - ddc_pin_map = rkl_pch_tgp_ddc_pin_map; - n_entries = ARRAY_SIZE(rkl_pch_tgp_ddc_pin_map); - } else { - ddc_pin_map = icp_ddc_pin_map; - n_entries = ARRAY_SIZE(icp_ddc_pin_map); - } + ddc_pin_map = icp_ddc_pin_map; + n_entries = ARRAY_SIZE(icp_ddc_pin_map); } else if (HAS_PCH_CNP(dev_priv)) { ddc_pin_map = cnp_ddc_pin_map; n_entries = ARRAY_SIZE(cnp_ddc_pin_map); diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h index 1a17ef519d74..54bcc6a6947c 100644 --- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h +++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h @@ -319,8 +319,6 @@ enum vbt_gmbus_ddi { ICL_DDC_BUS_DDI_A = 0x1, ICL_DDC_BUS_DDI_B, TGL_DDC_BUS_DDI_C, - RKL_DDC_BUS_DDI_D = 0x3, - RKL_DDC_BUS_DDI_E, ICL_DDC_BUS_PORT_1 = 0x4, ICL_DDC_BUS_PORT_2, ICL_DDC_BUS_PORT_3,