From patchwork Mon Oct 3 17:00:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997683 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 8D995C433FE for ; Mon, 3 Oct 2022 17:01:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D731910E438; Mon, 3 Oct 2022 17:01:25 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 420F110E3DD for ; Mon, 3 Oct 2022 17:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816481; x=1696352481; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=pRHK5vO/PwOmhnsvMWUiYBRyxrfj8LiJrAN6K1wdhIU=; b=Y7t4gH2TRdHtQ217hqTjE3cAV1c8afMamQg9ncQ7Kz4J/jLSTAYzexhT kBHiF5mqGyxp7ZGTQoBJgMpNZ1tv0omitdLY6iuAGbkSbWzukv3cI822L EjnVxWFiWY4Q3Gt0II8IjEU+cI2/edgpV/ziJy4puykoptzwvBqqRiPq2 FORzFWcmA284++sEmVbjd683C6lO7Cd2IpP7RQNIaqFsfmuRlclpyAZU1 W8hc0gWiZqgS0wn5JNnurCfA/yo89LyXoU6zV0jdB1vDnI3xqK40Ye4gf DFFZ/dqXZLplxg8zIC1OfWgneL+E4igC66jOKgEaTWIYmb4bxcTIm+UCD w==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="285850200" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="285850200" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:00:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="692140510" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="692140510" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 03 Oct 2022 10:00:43 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:42 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:42 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:00:42 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P0Ma6CNzamZsYP1cec7QP6cTrIY3MsRg9pUXwJtgQuGz5W/ObR4SA/cN5VaVHM0Tcto1T4LAkzBsWxDUwwaFapMXNcnfWbAlAsjWVMmt6O/XvX/cy5XAeB7e2xeZrbf6fN0fkgOIVR33TMIPRoXMwBFfUBY4Z+kYWnU9Kw9wOkVRENuQmEZpJPP0i5Xp6KzMSHryjshW9u0Rbp6+WVQC/kzCZe0H4J1Im+bcPnxD6gccLzxrsiy69SW7huRFNCrDiDlPj7H8CWomulG1N75fQTLh+1+oV+kZIKdE5g8NGrX7QM+4VjmSxVwg6EY5VzWcylPar0SpNxLd1+jfv0+cbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KhmdwEkC3ReYFZupqGWRqjCzUKtdikn44PGDSRK/+ng=; b=e4AoD36mxHpQHe8CLyjQDKoNJr+vgAgeTL4d3I45AwEcTHMerPgVVWoPoJQCzDhLR5Sq2j3CWyTYYVPa+SEWlpehYbt0LZoKpRGYaduUPeoe9g8fFI7rw6WbtZMzEfyPT0RhlhOiqr1c+RgdfxVB8TtPJCPjzXpdB3l0I2TD9Ok4quwQj/0kG27lJg2UT0I/l3LWrIsw1hkjhH3DxpkIQ8w48Shc7rg5/A+zEtrU89kzA7MPLyAxFaqPNHiH5BJemiFRnjunhnhyxhQykCcngSuVXVUI+ONgfQJt8Um9lVDylf4btN2BzzItqkquSCGU5Kn/iSx7tvVuPq6VYbr3CA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by LV2PR11MB5976.namprd11.prod.outlook.com (2603:10b6:408:17c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Mon, 3 Oct 2022 17:00:40 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:00:40 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:18 +0530 Message-ID: <20221003170024.195223-2-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:6::12) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|LV2PR11MB5976:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c7e08b4-a789-4763-2c44-08daa560ccb0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DRdKjPO9AtakI6lUsFU+2Z61Zpj/g5ClxrEkRW3uUHSTcFfG6TfzoOtqscOhflwnIr6c2AN+iPTB7BGLUjjG69p6X9eGGETQm28uvrsUBF33U+wEuj+VYw3MdCGoAtgLJ4+E08pYp+13l2ByXhbDn0NBt5+BojEt/ZxLd5XLTNEv6+DQewHBHlfxjxrC1LabDbJ3RTcNdExgXAB2VSv+coTtH+EV1v+R28h4C2lKtL0VfiV9msL+1AulhAM7wqqocm4oVy8Kmja29WXL9jfy+Ey9/H0ue1wpfgtXIm3XNy69II4LLjgn1BZjr6fwNySFGD7shfRea9G4uZgN/lJrC6dxUm7jm2Pa0EOrQvVOGOG4fKbA1sNAWsTKpTRbHMT13YW8ElkAg9M0O2RxBSqd4BSw2onuiVLPyDJ70NQ9U8784H+BPt1nQCrQWCz+X79sWsGdy7QOO5qGKkVH4MCgxvBbl9Y6/jt4g9G530ozy00J9B5NtE5WTB1cKoOPPVUc3DD450VJGKA+FPoSyRfBYr3qjTXLAG/KQxsGiV6Db44LB3TTNLs5x2aXRTku3JoLy4UIXGY2VDo5NqLGL89m39MiN125ALp2nCgQDmzGgi0lM1S+FuxsnQyMpw9SZ/uZk3VNrDDFelBtF9xE5LLiHlZwb7fCeorMIg9NrhuXEeC3kyh2nB0I43UOCNYfTtMYPsZebKuzWELy9bjpcOwBFA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(39860400002)(366004)(376002)(346002)(136003)(396003)(451199015)(82960400001)(1076003)(86362001)(6506007)(6512007)(5660300002)(26005)(478600001)(36756003)(6666004)(6486002)(38100700002)(66476007)(66556008)(44832011)(41300700001)(2616005)(2906002)(30864003)(8936002)(186003)(316002)(6916009)(54906003)(66946007)(83380400001)(8676002)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7hN18IqwBnmnxb7XCNNLkOafmYozOiI6SXQnIQHO9q+AFJImldPI0Sw+YkW4hiWJUtE7qk2B1Xhyl/R9LlkVOoZC3hszRz7UEiP6Aaj5RPquIKuMceALH+4wWoE7UNp0z7e76DvFya0lmXZkaqOuUgo28s1orxbq4jV8lmNLP75owfQPSkDSy3H1DYhBsi9sArDU/PCX++/s+mcvzDQW6LeYH4hfDGsrWnhACrVEnEt4jvgG8+ksBnvX/PXtuAI9bdVTDfwQSXVjhUj5AZn4A6pgHuuUYqZjhRU0ccUHUtecBnP94BU8PFDajXURCtA4/OyQenxLystQ4p/Oq46IJ3IvWuawOIq9v0dqq27Mx5kcwRbteQZmnUFn1Uqr2RTF8R+ERd4Zy+1uR+4STNe1RZURe6yPK41Y7IRERyUqBz3T0hcCZeHXYaqWzEb35I6OJ+mk/ZIaseozKyjB7HnQA4CQ/+AEl2PHNXDuvuQJKshq0o4GpuUVWakrDh3Opq+3e27yKZtVWKf5CHldVqekhHmAw3WoS1b5KtBoM1rwaJ1F/0pSiNEInko2ISxTdpvEX5UVOd8ef2u5UES/RSc2fHxN+1c8qXGw0oB7LvVbzLRcGZw2wgFpRpDNkP/pDOFJRIsIDsIrQv4q0zifYfdSZ6SiNOOrWINrdgDN9WuxXSnH58h0MTMHHsfgLkeqtyrXPgsHFQ6HZZFa+PZOEaonIB/24EvIKyTpj+M3dIJNjDuvGRegeTTDTA8t3oqQ5kFIHtzUPaeOD22u4VAoIVJ9KwclzVQSOU8n7W7C2IowrW8XmX9O+HOLc8Wwqw9waYH5QkcJAm3fUOT+nca2w0upA0IBu22070X3Ss6QMzF2Q7/aqxh4u7Kc1vrmIHYKmkdJOirAypyGTCbi+PoTLNsI7yiYArM00MYbKQNONrNV9ZbW1gF6QoapE3GoiwCujp28tz7z87RFRiWNJV14czlJ8MRdR4cRWIm48KxUgxBxvMIiLIEFzOvX7tN9GFj5/AHw2Y7P/wCsfvmiU+BtFSkyUpeqXrcJdcQjt3qxUTxUWKTxwRGMYHK99DC7g2nb7jMHTA1iaaYjSA3m56l5AtS1q/bukowD58OWKgi1yIEiDOruMJdixs6Mp3yxcQGK0WzXlZMzvZ13jI1t6X32sK8wEn8Kjbpiszw20AiXHrGGJlF345kd/5XZZXZvX1Dk0jcT+7Xf65D9MU41opuWfz033EF7cU1yk7BhkZHwU8RlUISURSPq33gfdhDyH3TSM7iXxpil6RSypKoSbAQgAun6WGRc11llNmsj1dDojB8nd7zLfLjprPAFt46e5p3uqx8+Gozz4z+AfGiSyYm1zpTb9942hkIzBW10lugtGGnSr5F96eNj4Lu3O7fYhSlBxUpolnlXbhgvNlDYDIBhvFvFzVeyRkJ6+3ujP+aEwzP8SLaSRvYy5z4mW/CgOuH7quU9bc/1VcDykExRJ4lMrCbwlX4d/6YbXdCP0uHosHsMhCYWLcogrOM6smUULepkeBgzP0mnhiLbYQl+lEshCD7dP9F8jNY3Sm30gAHaEKZ+oJ2kVjw+97AstxI15Robw2Z8hF2WGrO6gIbhcAZ2olWWE/8wFaf45VuLHDGz0T5QPJg= X-MS-Exchange-CrossTenant-Network-Message-Id: 5c7e08b4-a789-4763-2c44-08daa560ccb0 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:00:39.9481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UDu8WcPUa5QyoUCH+waYnbVyPdRH9dylwmiH+JC8xbbSlcr8YapbHtIg9l1/Wn2Jyp8WsT4FuB3dG80Ow0DwQbCgdQzKj7OuSvXCV7llaulk7ks8/xCQ46Y7zealefYk X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR11MB5976 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 1/7] drm/i915/display: Pass struct drm_i915_private to DDI_BUF_CTL macro 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" This is a prep patch for a patch series in which register offset of the DDI ports are not calculated using the port enums but using a different datastructure part of the device info. So the device info is passed as a parameter to the macro DDI_BUF_CTL but unused yet. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +++--- drivers/gpu/drm/i915/display/intel_ddi.c | 39 +++++++++++--------- drivers/gpu/drm/i915/display/intel_display.c | 6 ++- drivers/gpu/drm/i915/display/intel_fdi.c | 14 +++---- drivers/gpu/drm/i915/display/intel_tc.c | 6 +-- drivers/gpu/drm/i915/gvt/display.c | 30 +++++++-------- drivers/gpu/drm/i915/gvt/handlers.c | 17 +++++---- drivers/gpu/drm/i915/i915_reg.h | 6 ++- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 10 ++--- 9 files changed, 76 insertions(+), 64 deletions(-) diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index 47f13750f6fa..f7c1f6561423 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -548,11 +548,11 @@ static void gen11_dsi_enable_ddi_buffer(struct intel_encoder *encoder) enum port port; for_each_dsi_port(port, intel_dsi->ports) { - tmp = intel_de_read(dev_priv, DDI_BUF_CTL(port)); + tmp = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); tmp |= DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(port), tmp); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), tmp); - if (wait_for_us(!(intel_de_read(dev_priv, DDI_BUF_CTL(port)) & + if (wait_for_us(!(intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & DDI_BUF_IS_IDLE), 500)) drm_err(&dev_priv->drm, "DDI port:%c buffer idle\n", @@ -1400,11 +1400,11 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder) gen11_dsi_ungate_clocks(encoder); for_each_dsi_port(port, intel_dsi->ports) { - tmp = intel_de_read(dev_priv, DDI_BUF_CTL(port)); + tmp = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); tmp &= ~DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(port), tmp); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), tmp); - if (wait_for_us((intel_de_read(dev_priv, DDI_BUF_CTL(port)) & + if (wait_for_us((intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & DDI_BUF_IS_IDLE), 8)) drm_err(&dev_priv->drm, diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 971356237eca..77a986696c76 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -172,7 +172,7 @@ void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, return; } - if (wait_for_us((intel_de_read(dev_priv, DDI_BUF_CTL(port)) & + if (wait_for_us((intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & DDI_BUF_IS_IDLE), 8)) drm_err(&dev_priv->drm, "Timeout waiting for DDI BUF %c to get idle\n", port_name(port)); @@ -189,7 +189,7 @@ static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv, return; } - ret = _wait_for(!(intel_de_read(dev_priv, DDI_BUF_CTL(port)) & + ret = _wait_for(!(intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & DDI_BUF_IS_IDLE), IS_DG2(dev_priv) ? 1200 : 500, 10, 10); if (ret) @@ -730,7 +730,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, if (!wakeref) return; - tmp = intel_de_read(dev_priv, DDI_BUF_CTL(port)); + tmp = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); if (!(tmp & DDI_BUF_CTL_ENABLE)) goto out; @@ -1397,8 +1397,8 @@ hsw_set_signal_levels(struct intel_encoder *encoder, intel_dp->DP &= ~DDI_BUF_EMP_MASK; intel_dp->DP |= signal_levels; - intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP); - intel_de_posting_read(dev_priv, DDI_BUF_CTL(port)); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), intel_dp->DP); + intel_de_posting_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); } static void _icl_ddi_enable_clock(struct drm_i915_private *i915, i915_reg_t reg, @@ -2577,10 +2577,10 @@ static void intel_disable_ddi_buf(struct intel_encoder *encoder, bool wait = false; u32 val; - val = intel_de_read(dev_priv, DDI_BUF_CTL(port)); + val = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); if (val & DDI_BUF_CTL_ENABLE) { val &= ~DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(port), val); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), val); wait = true; } @@ -2909,7 +2909,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, drm_WARN_ON(&dev_priv->drm, !intel_tc_port_in_legacy_mode(dig_port)); buf_ctl |= DDI_BUF_CTL_TC_PHY_OWNERSHIP; } - intel_de_write(dev_priv, DDI_BUF_CTL(port), buf_ctl); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), buf_ctl); intel_audio_codec_enable(encoder, crtc_state, conn_state); } @@ -3113,9 +3113,9 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp, dp_tp_ctl = intel_de_read(dev_priv, dp_tp_ctl_reg(encoder, crtc_state)); if (dp_tp_ctl & DP_TP_CTL_ENABLE) { - ddi_buf_ctl = intel_de_read(dev_priv, DDI_BUF_CTL(port)); + ddi_buf_ctl = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); if (ddi_buf_ctl & DDI_BUF_CTL_ENABLE) { - intel_de_write(dev_priv, DDI_BUF_CTL(port), + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), ddi_buf_ctl & ~DDI_BUF_CTL_ENABLE); wait = true; } @@ -3145,8 +3145,8 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp, adlp_tbt_to_dp_alt_switch_wa(encoder); intel_dp->DP |= DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP); - intel_de_posting_read(dev_priv, DDI_BUF_CTL(port)); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, port), intel_dp->DP); + intel_de_posting_read(dev_priv, DDI_BUF_CTL(dev_priv, port)); intel_wait_ddi_buf_active(dev_priv, port); } @@ -3823,13 +3823,15 @@ static struct intel_connector * intel_ddi_init_dp_connector(struct intel_digital_port *dig_port) { struct intel_connector *connector; - enum port port = dig_port->base.port; + struct intel_encoder *encoder = &dig_port->base; + enum port port = encoder->port; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); connector = intel_connector_alloc(); if (!connector) return NULL; - dig_port->dp.output_reg = DDI_BUF_CTL(port); + dig_port->dp.output_reg = DDI_BUF_CTL(i915, port); dig_port->dp.prepare_link_retrain = intel_ddi_prepare_link_retrain; dig_port->dp.set_link_train = intel_ddi_set_link_train; dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train; @@ -4061,12 +4063,13 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port) { struct intel_connector *connector; enum port port = dig_port->base.port; + struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev); connector = intel_connector_alloc(); if (!connector) return NULL; - dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port); + dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(dev_priv, port); intel_hdmi_init_connector(dig_port, connector); return connector; @@ -4102,7 +4105,7 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port) return max_lanes; if (port == PORT_A || port == PORT_E) { - if (intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES) + if (intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_A)) & DDI_A_4_LANES) max_lanes = port == PORT_A ? 4 : 0; else /* Both A and E share 2 lanes */ @@ -4464,11 +4467,11 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) if (DISPLAY_VER(dev_priv) >= 11) dig_port->saved_port_bits = - intel_de_read(dev_priv, DDI_BUF_CTL(port)) + intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & DDI_BUF_PORT_REVERSAL; else dig_port->saved_port_bits = - intel_de_read(dev_priv, DDI_BUF_CTL(port)) + intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, port)) & (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES); if (intel_bios_is_lane_reversal_needed(dev_priv, port)) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 3ffd8fc0b05c..8681055843f0 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7884,7 +7884,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv) return false; /* DDI E can't be used if DDI A requires 4 lanes */ - if (intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES) + if (intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_A)) & DDI_A_4_LANES) return false; if (!dev_priv->display.vbt.int_crt_support) @@ -7970,7 +7970,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_crt_init(dev_priv); /* Haswell uses DDI functions to detect digital outputs. */ - found = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED; + found = intel_de_read(dev_priv, + DDI_BUF_CTL(dev_priv, PORT_A)) & + DDI_INIT_DISPLAY_DETECTED; if (found) intel_ddi_init(dev_priv, PORT_A); diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c index 7f47e5c85c81..d3d92ac26099 100644 --- a/drivers/gpu/drm/i915/display/intel_fdi.c +++ b/drivers/gpu/drm/i915/display/intel_fdi.c @@ -818,9 +818,9 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, * DDI E does not support port reversal, the functionality is * achieved on the PCH side in FDI_RX_CTL, so no need to set the * port reversal bit */ - intel_de_write(dev_priv, DDI_BUF_CTL(PORT_E), + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E), DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes - 1) << 1) | DDI_BUF_TRANS_SELECT(i / 2)); - intel_de_posting_read(dev_priv, DDI_BUF_CTL(PORT_E)); + intel_de_posting_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E)); udelay(600); @@ -864,10 +864,10 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), rx_ctl_val); intel_de_posting_read(dev_priv, FDI_RX_CTL(PIPE_A)); - temp = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_E)); + temp = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E)); temp &= ~DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(PORT_E), temp); - intel_de_posting_read(dev_priv, DDI_BUF_CTL(PORT_E)); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E), temp); + intel_de_posting_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E)); /* Disable DP_TP_CTL and FDI_RX_CTL and retry */ temp = intel_de_read(dev_priv, DP_TP_CTL(PORT_E)); @@ -909,9 +909,9 @@ void hsw_fdi_disable(struct intel_encoder *encoder) val &= ~FDI_RX_ENABLE; intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), val); - val = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_E)); + val = intel_de_read(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E)); val &= ~DDI_BUF_CTL_ENABLE; - intel_de_write(dev_priv, DDI_BUF_CTL(PORT_E), val); + intel_de_write(dev_priv, DDI_BUF_CTL(dev_priv, PORT_E), val); intel_wait_ddi_buf_idle(dev_priv, PORT_E); diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index b0aa1edd8302..a308665340d4 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -410,12 +410,12 @@ static bool adl_tc_phy_take_ownership(struct intel_digital_port *dig_port, enum port port = dig_port->base.port; u32 val; - val = intel_uncore_read(uncore, DDI_BUF_CTL(port)); + val = intel_uncore_read(uncore, DDI_BUF_CTL(i915, port)); if (take) val |= DDI_BUF_CTL_TC_PHY_OWNERSHIP; else val &= ~DDI_BUF_CTL_TC_PHY_OWNERSHIP; - intel_uncore_write(uncore, DDI_BUF_CTL(port), val); + intel_uncore_write(uncore, DDI_BUF_CTL(i915, port), val); return true; } @@ -455,7 +455,7 @@ static bool adl_tc_phy_is_owned(struct intel_digital_port *dig_port) enum port port = dig_port->base.port; u32 val; - val = intel_uncore_read(uncore, DDI_BUF_CTL(port)); + val = intel_uncore_read(uncore, DDI_BUF_CTL(i915, port)); return val & DDI_BUF_CTL_TC_PHY_OWNERSHIP; } diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c index c7722c818b4d..5e3cd306c41d 100644 --- a/drivers/gpu/drm/i915/gvt/display.c +++ b/drivers/gpu/drm/i915/gvt/display.c @@ -213,10 +213,10 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) PORT_PLL_REF_SEL | PORT_PLL_LOCK | PORT_PLL_ENABLE); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(port)) &= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, port)) &= ~(DDI_INIT_DISPLAY_DETECTED | DDI_BUF_CTL_ENABLE); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(port)) |= DDI_BUF_IS_IDLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, port)) |= DDI_BUF_IS_IDLE; } vgpu_vreg_t(vgpu, PCH_PORT_HOTPLUG) &= ~(PORTA_HOTPLUG_ENABLE | PORTA_HOTPLUG_STATUS_MASK); @@ -276,9 +276,9 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) (PORT_PLL_POWER_STATE | PORT_PLL_POWER_ENABLE | PORT_PLL_REF_SEL | PORT_PLL_LOCK | PORT_PLL_ENABLE); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_A)) |= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_A)) |= (DDI_BUF_CTL_ENABLE | DDI_INIT_DISPLAY_DETECTED); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_A)) &= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_A)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_EDP)) |= (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST | @@ -305,9 +305,9 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) (PORT_PLL_POWER_STATE | PORT_PLL_POWER_ENABLE | PORT_PLL_REF_SEL | PORT_PLL_LOCK | PORT_PLL_ENABLE); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) |= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_B)) |= DDI_BUF_CTL_ENABLE; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) &= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_B)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |= (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST | @@ -335,9 +335,9 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) (PORT_PLL_POWER_STATE | PORT_PLL_POWER_ENABLE | PORT_PLL_REF_SEL | PORT_PLL_LOCK | PORT_PLL_ENABLE); - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) |= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_C)) |= DDI_BUF_CTL_ENABLE; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) &= + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_C)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |= (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST | @@ -416,8 +416,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_B)) |= PORT_CLK_SEL_LCPLL_810; } - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) |= DDI_BUF_CTL_ENABLE; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) &= ~DDI_BUF_IS_IDLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_B)) |= DDI_BUF_CTL_ENABLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_B)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTB_HOTPLUG_CPT; } @@ -442,8 +442,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_C)) |= PORT_CLK_SEL_LCPLL_810; } - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) |= DDI_BUF_CTL_ENABLE; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) &= ~DDI_BUF_IS_IDLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_C)) |= DDI_BUF_CTL_ENABLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_C)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDIC_DETECTED; } @@ -468,8 +468,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_D)) |= PORT_CLK_SEL_LCPLL_810; } - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_D)) |= DDI_BUF_CTL_ENABLE; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_D)) &= ~DDI_BUF_IS_IDLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_D)) |= DDI_BUF_CTL_ENABLE; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_D)) &= ~DDI_BUF_IS_IDLE; vgpu_vreg_t(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDID_DETECTED; } @@ -488,7 +488,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) else vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTA_HOTPLUG_SPT; - vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_A)) |= DDI_INIT_DISPLAY_DETECTED; + vgpu_vreg_t(vgpu, DDI_BUF_CTL(dev_priv, PORT_A)) |= DDI_INIT_DISPLAY_DETECTED; } /* Clear host CRT status, so guest couldn't detect this host CRT. */ diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index daac2050d77d..15393c861721 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c @@ -787,13 +787,15 @@ static int force_nonpriv_write(struct intel_vgpu *vgpu, static int ddi_buf_ctl_mmio_write(struct intel_vgpu *vgpu, unsigned int offset, void *p_data, unsigned int bytes) { + struct drm_i915_private *i915 = vgpu->gvt->gt->i915; + write_vreg(vgpu, offset, p_data, bytes); if (vgpu_vreg(vgpu, offset) & DDI_BUF_CTL_ENABLE) { vgpu_vreg(vgpu, offset) &= ~DDI_BUF_IS_IDLE; } else { vgpu_vreg(vgpu, offset) |= DDI_BUF_IS_IDLE; - if (offset == i915_mmio_reg_offset(DDI_BUF_CTL(PORT_E))) + if (offset == i915_mmio_reg_offset(DDI_BUF_CTL(i915, PORT_E))) vgpu_vreg_t(vgpu, DP_TP_STATUS(PORT_E)) &= ~DP_TP_STATUS_AUTOTRAIN_DONE; } @@ -812,7 +814,8 @@ static int fdi_rx_iir_mmio_write(struct intel_vgpu *vgpu, static int fdi_auto_training_started(struct intel_vgpu *vgpu) { - u32 ddi_buf_ctl = vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_E)); + struct drm_i915_private *i915 = vgpu->gvt->gt->i915; + u32 ddi_buf_ctl = vgpu_vreg_t(vgpu, DDI_BUF_CTL(i915, PORT_E)); u32 rx_ctl = vgpu_vreg(vgpu, _FDI_RXA_CTL); u32 tx_ctl = vgpu_vreg_t(vgpu, DP_TP_CTL(PORT_E)); @@ -2333,11 +2336,11 @@ static int init_generic_mmio_info(struct intel_gvt *gvt) MMIO_F(_MMIO(_DPA_AUX_CH_CTL), 6 * 4, 0, 0, 0, D_ALL, NULL, dp_aux_ch_ctl_mmio_write); - MMIO_DH(DDI_BUF_CTL(PORT_A), D_ALL, NULL, ddi_buf_ctl_mmio_write); - MMIO_DH(DDI_BUF_CTL(PORT_B), D_ALL, NULL, ddi_buf_ctl_mmio_write); - MMIO_DH(DDI_BUF_CTL(PORT_C), D_ALL, NULL, ddi_buf_ctl_mmio_write); - MMIO_DH(DDI_BUF_CTL(PORT_D), D_ALL, NULL, ddi_buf_ctl_mmio_write); - MMIO_DH(DDI_BUF_CTL(PORT_E), D_ALL, NULL, ddi_buf_ctl_mmio_write); + MMIO_DH(DDI_BUF_CTL(dev_priv, PORT_A), D_ALL, NULL, ddi_buf_ctl_mmio_write); + MMIO_DH(DDI_BUF_CTL(dev_priv, PORT_B), D_ALL, NULL, ddi_buf_ctl_mmio_write); + MMIO_DH(DDI_BUF_CTL(dev_priv, PORT_C), D_ALL, NULL, ddi_buf_ctl_mmio_write); + MMIO_DH(DDI_BUF_CTL(dev_priv, PORT_D), D_ALL, NULL, ddi_buf_ctl_mmio_write); + MMIO_DH(DDI_BUF_CTL(dev_priv, PORT_E), D_ALL, NULL, ddi_buf_ctl_mmio_write); MMIO_DH(DP_TP_CTL(PORT_A), D_ALL, NULL, dp_tp_ctl_mmio_write); MMIO_DH(DP_TP_CTL(PORT_B), D_ALL, NULL, dp_tp_ctl_mmio_write); diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 2126e441199d..a91bbc6e1255 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -6936,7 +6936,11 @@ enum skl_power_gate { /* DDI Buffer Control */ #define _DDI_BUF_CTL_A 0x64000 #define _DDI_BUF_CTL_B 0x64100 -#define DDI_BUF_CTL(port) _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B) +#define DDI_BUF_CTL(i915, port) ({ \ + (void)i915; /* Suppress unused variable warning */ \ + _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B); \ + }) + #define DDI_BUF_CTL_ENABLE (1 << 31) #define DDI_BUF_TRANS_SELECT(n) ((n) << 24) #define DDI_BUF_EMP_MASK (0xf << 24) diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c index 8279dc580a3e..b55bdc2cdd84 100644 --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c @@ -503,11 +503,11 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter) MMIO_D(SBI_CTL_STAT); MMIO_D(PIXCLK_GATE); MMIO_F(_MMIO(_DPA_AUX_CH_CTL), 6 * 4); - MMIO_D(DDI_BUF_CTL(PORT_A)); - MMIO_D(DDI_BUF_CTL(PORT_B)); - MMIO_D(DDI_BUF_CTL(PORT_C)); - MMIO_D(DDI_BUF_CTL(PORT_D)); - MMIO_D(DDI_BUF_CTL(PORT_E)); + MMIO_D(DDI_BUF_CTL(dev_priv, PORT_A)); + MMIO_D(DDI_BUF_CTL(dev_priv, PORT_B)); + MMIO_D(DDI_BUF_CTL(dev_priv, PORT_C)); + MMIO_D(DDI_BUF_CTL(dev_priv, PORT_D)); + MMIO_D(DDI_BUF_CTL(dev_priv, PORT_E)); MMIO_D(DP_TP_CTL(PORT_A)); MMIO_D(DP_TP_CTL(PORT_B)); MMIO_D(DP_TP_CTL(PORT_C)); From patchwork Mon Oct 3 17:00:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997679 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 ED4F4C433F5 for ; Mon, 3 Oct 2022 17:00:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EABC10E310; Mon, 3 Oct 2022 17:00:55 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A81A210E310 for ; Mon, 3 Oct 2022 17:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816451; x=1696352451; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Yc/GUEpZydBZ7pwAHgwB5emfOno2c17NHzSRPUnxEfs=; b=JL4zibfLR2juWC4r7r4TNrkBkl1kn931tUJjQn/He4FSuPfCzfVLH7YH K7ESsThtwB8FO3E5ZNzpd6qQtHqfp95yD4wYm4r+RVMrZIISeQkBI/94U kHeHyywjeHFUfCEE3bJ/Xj0UOp/ifdebIsxIgYzKfjskmXhgZeuiGePx1 NfVJNykxCFAQLzZqYJMn7NsKJJTA7EMU/8JxTZiaNsHK5kWR3jfEkCLda G4PAd1J4nVIbvXWHbf799VWajYoTDtPLEf/gUXyqPCCz8pA31izCNEZ3K DFgId1ftCaW1tXI9WFQ3qPvdbV4OQ2zX8HATqBPEYiTEACtC5GsM9bQgG w==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="364560082" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="364560082" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:00:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="868666515" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="868666515" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga006.fm.intel.com with ESMTP; 03 Oct 2022 10:00:50 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:49 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:00:49 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTjHzm0rCnfyC/8Oes8Q9gx9pJ1WEQAelZ91ekwRnQHKcLew6f1bYr9lgX4z/iN/cgWCNF+pKx8lhqB20NvrKTTdDJYDYV5x8XHwYvOeUzmEpVY8nO0tGMW4vwCwTcovcMvT1NcixTjbRQU7wu88ZKBMWu17ANsnGVWmlX1BYOsTcPNIqnqY+LsxlUsQ95m8H1zMdOwa161sDW/r1lBjTvx+adwDS6vYgTihehPUdTBMhFdkKe88oHWGmsGekLkBdkzhsrN49h2I9QnQbMEXycHYZieBw8QYvTaZI321FXsJwDTAv0+J4y8feftE5e7CM4bL0JLBlIAH52AjkUIkYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NV4dgGmsQlfAPf7NNyNMGP4/cZvb0EgFzwpiLBbqccc=; b=hZH2LdsuZAnxrGNtNFhFcLldCqf+5TE9YXr2F1vwlbSC0FvSqD8Sc7to38yQwxs29WsBBATu8e+41f84vYhVC4UAC2UTllz0/aqlhPaAPcOghpMk0oeP8NVImSTlagmuwKOOf4GPFfAtiHxcLQSZayxLs3zE6xQg7NhQW8EgeV2BVi7DGbwMD+7sMt8I5ZbPV2evxBnfyKjIYMTKqQbveZsA+Wm8iU16nfNqzGjnPaSWOH3S5g1q2H93E1O3+5XEy56E3kFCt5PErNLdQ8XVH3R9HCRt/yZhamrWbyHwuZ5g1dY8amE3IsC7vg+ZE/BmTqXsHus54PSr9Ng4bbu4pA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by LV2PR11MB5976.namprd11.prod.outlook.com (2603:10b6:408:17c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Mon, 3 Oct 2022 17:00:47 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:00:47 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:19 +0530 Message-ID: <20221003170024.195223-3-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0219.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:ea::13) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|LV2PR11MB5976:EE_ X-MS-Office365-Filtering-Correlation-Id: a5458ec9-5d99-4180-9e3d-08daa560d16d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9XsTl9shb5eIhShQIAMdpINoSvCT5qVdvT781oZps09W7rKsmwYCvmPwOa3ykK47Z3tfytcF8rgbHAu3JB3qGcyveQKnLXd7leeFZ7u2jFfmOa6he/Khc7RmD4IluF/tWbQPLz+GPWPCnDp1jtj8Tp+NdR4o+FSPCDAOe4YQBGZahxVrgfbR5+ohATCRAaoO0XEUQB3veU0OwMGLfS53c1E5Sd9ugGImiHodBTXlCo1WmwsiKUXuSZJzOQqj/mUQLid7kbZN10NORe56gj9nUBjeA88uzTl3J7XRmljiKznlePzy3NrW9O+mJkU6LwPN3XbzOl2/yo1Jmms0hAtAnO2BVETRqrB7lgHChMQ5JIzQWKRsnCKvZQmtarLWNDajpORN5obK30kDHsUCQ07BhvSeLKeInELQNbsdVKlJ9U6sUN8CWUEAMyC0xDeKEPpFhM6wvvlHX27kHl08knlU2wqyQ8i0v9hNjZfJxJ8Xr1yYOxFBEa3qPKgnoO48Xn2Msc75UHI5dtmWIGju/kiuOQ7/AYM9fAWP0msH0pwF11vO8cP1LMfqWjrKA6HAMgxnG/8Qyl1AOlL1c7uxl3zOX5iwSnawHcnAPH4S9U0oStiza2qu8U1rwEV0R0g0oMfwOxbtqkZtc7Bv707aqWZ6B6BCaLYAdKChC2PSSKbm1RkqyISE81VGafzrMf30D+AZ120k6gu1dxOw3n66VzGN/A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(39860400002)(366004)(376002)(346002)(136003)(396003)(451199015)(82960400001)(1076003)(86362001)(6506007)(6512007)(5660300002)(26005)(478600001)(36756003)(6666004)(6486002)(38100700002)(66476007)(66556008)(44832011)(41300700001)(2616005)(2906002)(8936002)(186003)(316002)(6916009)(54906003)(66946007)(83380400001)(8676002)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H//W5r0O4UAyA1552YD7/Tg5psuLiNFNvl8PYvBsvwC4LODSoOZQfo6XwX4IiytATTP9GQpJKMhc8upsrbSxlqdaaFgqNm7sdp+OB8aSkgOUzm57fRJjn5LLKkI4uW5zNkW4bpBx6N7FCKd7w06zT+00yKsrDnP7NA6IKawNlBYWDGaTQ9E2c1mNSRgqlmx6XUWDZmi1hDtBAwSVFN+sWvHQgaeGFqi5cOS0bCtRO3JiKTPVvXtH90SDLZDynK28J9C9lrylOrk4wgYkEPRbDcFr+22QouBNuY7z0UnR1/LrXhB5B0xfFCHNylKJBtRLGMy9MY7dfCekfmIRB9eTpBv3rRWGjOMaGeuT8H24UFz4ol276tj+a2jUcxJH8tbIvpnjRpnIxDzqbTcLv79kCqRy0Vv0ASJF9P5cRTAlE5KGFt+IibcjL0vlTZnuaDDnvFQyWB55c7rIVZIaegTLRFISG3Bu0XRgeJC2dCu5iEgJSCK3422vAQstaYX6YTl6uBzsyO62lk9g4ZXaKaz81ozu/hjW5Z+YXP/2arbIVM40p3x09Mg4VsWayrbP92O+o9PKGkpmK4pMEAw9tHk6TQ5W1uVsae0JILe+kj+CScae+khr91lFiJ+R2w/UgvMRCHdNLkCl0X8X7XXlOr/LicKm29IGOO7qPqT6Tgw56pqOor1j6184425cPjFXFCIiTowat8UVqzCMKOLalyIrlrp0xLlturGmNmfFu4l1IUVlxOj5j4/dITXYQUjMfOkYU++vkVmbqYfU3A2bnaUciEwWAf1GF1ylcyGORvfdXqNu+cwk2KVJbQHPNM9eL846DlaDgpVuzLwFtZylmnRgVNXyfdVqpcZ0V05F6AlqHZglE9LSdKCHFC0ck69iTCsZ5USJRRxDVsh09RuoG5+1TdWpbPXu37CAiIA5DQBBXKAHMEyVzHbLMoGIj3JuSiwz3q79KFuiQ8q+oAoOsmy/t8XHeP0M6YLSo9i4eH4RJrkhKPWhmz7J65ogZwnBu6aEFGwoi8RQAEG77uVp+3PVEMySreJ/aaPZO5PCI2hZ0lTDUMulL0V/Ph7WnIFwGuEzEqO12mZM/8J8yi4MueHJQ0ckNJ7m7iShqCBHnHnim556SYZ3K2dLb+wj7PyW7KgnVfa3Yb+ZaGr54S/7aQZeDp/+/OiTx3h5dLRUMxg+Fiu1I7MRuK2mZruY+A7uk3aJRDhJpjKvek9FiCA6KtsSqRajAwnApG2G3kKLnsYegMIimBEAduBkwK5mtJPs3mGjZ26rej5NK/s7HWfsQA011otH+6qIx9AkO9Ls/tYU2/YMQJI+CktUtow8vhudg9H+t1zSPZt0/H7Odq+IOypz5zTRvSr2SZb4IJLGoj2hMRqKotDgdlN3Pmu6gf7W2bqPLx27ulh/LptJVDZfGo1fj2Eh1NfR59PzthyBfzV6VoTV9KQBgCFWGURI2QSoEMhnid4qde4T9KR953dC3KM70QB8vy4l9qMXhqylVnSZi1PZDlWwWiY0odX7AlBMD1ESdInwxG3BcWd+f3fHlbU07PJ/Pel9qah9aeA1Cv6YqcF1aYl2MAUzpr55hLCTn6fPLBjC3WuzcSFIgPNwMQrYOfBtQEq1tzjp7I2hSmCvy/M= X-MS-Exchange-CrossTenant-Network-Message-Id: a5458ec9-5d99-4180-9e3d-08daa560d16d X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:00:47.6349 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P+QMku7kF2Ubwy8/ArpDz8n5Q3zRvKE5LPqyU0WWB2xl9ii4QJBdPMbUICuaeJZXjuX6ed1Xg6AFrQG/Rh+zRIOA17riBuYKNixod8egEpuPUf531/MzBvdoatqtcn2P X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR11MB5976 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 2/7] drm/i915/display: Pass struct drm_i915_private to DDI_CLK_SEL macro 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" DDI_CLK_SEL is an another macro which returns the register offset based on DDI port enum. So DDI_CLK_SEL has to be prepared for the new method being developed for calculating the register offsets of DDI ports. Macro receives i915 private structure as new parameter for the upcoming changes. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/intel_ddi.c | 17 +++++++++-------- drivers/gpu/drm/i915/i915_reg.h | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 77a986696c76..e7beafafb857 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -305,7 +305,8 @@ static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder, static int icl_calc_tbt_pll_link(struct drm_i915_private *dev_priv, enum port port) { - u32 val = intel_de_read(dev_priv, DDI_CLK_SEL(port)) & DDI_CLK_SEL_MASK; + u32 val = intel_de_read(dev_priv, DDI_CLK_SEL(dev_priv, port)) & + DDI_CLK_SEL_MASK; switch (val) { case DDI_CLK_SEL_NONE: @@ -1656,7 +1657,7 @@ static void jsl_ddi_tc_enable_clock(struct intel_encoder *encoder, * "For DDIC and DDID, program DDI_CLK_SEL to map the MG clock to the port. * MG does not exist, but the programming is required to ungate DDIC and DDID." */ - intel_de_write(i915, DDI_CLK_SEL(port), DDI_CLK_SEL_MG); + intel_de_write(i915, DDI_CLK_SEL(i915, port), DDI_CLK_SEL_MG); icl_ddi_combo_enable_clock(encoder, crtc_state); } @@ -1668,7 +1669,7 @@ static void jsl_ddi_tc_disable_clock(struct intel_encoder *encoder) icl_ddi_combo_disable_clock(encoder); - intel_de_write(i915, DDI_CLK_SEL(port), DDI_CLK_SEL_NONE); + intel_de_write(i915, DDI_CLK_SEL(i915, port), DDI_CLK_SEL_NONE); } static bool jsl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) @@ -1677,7 +1678,7 @@ static bool jsl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) enum port port = encoder->port; u32 tmp; - tmp = intel_de_read(i915, DDI_CLK_SEL(port)); + tmp = intel_de_read(i915, DDI_CLK_SEL(i915, port)); if ((tmp & DDI_CLK_SEL_MASK) == DDI_CLK_SEL_NONE) return false; @@ -1696,7 +1697,7 @@ static void icl_ddi_tc_enable_clock(struct intel_encoder *encoder, if (drm_WARN_ON(&i915->drm, !pll)) return; - intel_de_write(i915, DDI_CLK_SEL(port), + intel_de_write(i915, DDI_CLK_SEL(i915, port), icl_pll_to_ddi_clk_sel(encoder, crtc_state)); mutex_lock(&i915->display.dpll.lock); @@ -1720,7 +1721,7 @@ static void icl_ddi_tc_disable_clock(struct intel_encoder *encoder) mutex_unlock(&i915->display.dpll.lock); - intel_de_write(i915, DDI_CLK_SEL(port), DDI_CLK_SEL_NONE); + intel_de_write(i915, DDI_CLK_SEL(i915, port), DDI_CLK_SEL_NONE); } static bool icl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) @@ -1730,7 +1731,7 @@ static bool icl_ddi_tc_is_clock_enabled(struct intel_encoder *encoder) enum port port = encoder->port; u32 tmp; - tmp = intel_de_read(i915, DDI_CLK_SEL(port)); + tmp = intel_de_read(i915, DDI_CLK_SEL(i915, port)); if ((tmp & DDI_CLK_SEL_MASK) == DDI_CLK_SEL_NONE) return false; @@ -1748,7 +1749,7 @@ static struct intel_shared_dpll *icl_ddi_tc_get_pll(struct intel_encoder *encode enum intel_dpll_id id; u32 tmp; - tmp = intel_de_read(i915, DDI_CLK_SEL(port)); + tmp = intel_de_read(i915, DDI_CLK_SEL(i915, port)); switch (tmp & DDI_CLK_SEL_MASK) { case DDI_CLK_SEL_TBT_162: diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index a91bbc6e1255..acb764755338 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -7075,7 +7075,10 @@ enum skl_power_gate { #define PORT_CLK_SEL_NONE REG_FIELD_PREP(PORT_CLK_SEL_MASK, 7) /* On ICL+ this is the same as PORT_CLK_SEL, but all bits change. */ -#define DDI_CLK_SEL(port) PORT_CLK_SEL(port) +#define DDI_CLK_SEL(i915, port) ({ \ + (void)i915; /* Suppress unused variable warning */ \ + PORT_CLK_SEL(port); \ + }) #define DDI_CLK_SEL_MASK REG_GENMASK(31, 28) #define DDI_CLK_SEL_NONE REG_FIELD_PREP(DDI_CLK_SEL_MASK, 0x0) #define DDI_CLK_SEL_MG REG_FIELD_PREP(DDI_CLK_SEL_MASK, 0x8) From patchwork Mon Oct 3 17:00:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997680 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 53166C433F5 for ; Mon, 3 Oct 2022 17:01:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C0C310E3A4; Mon, 3 Oct 2022 17:01:02 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4855710E38B for ; Mon, 3 Oct 2022 17:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816459; x=1696352459; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=XOLKi1vsOYJB4SZ7AM8VI/WTq6cjwbTYRiwjlV5xi/o=; b=P2w180ZyRML2FbqUTZyxUrLUOMzexuJ1ODmxTQXuNl8GS2PCENMwOuub nKq3Bf0JHKINLt4Z9C+cwewp3GsANBoj9Iw1bJBcMI1+evuujxyHrBKXy LDP/dShpfHUJydkulWpKtqM0AjDk1xOyXDpJoSL0D7MVnrfd4CaINWM+3 Q86y1br5LZ/kQbMH9WfrX8A4PgakO7IwaCMcyesYkOPrALOPax7lNcwXT h2TI+P8E02s/K9xcw1nKumbpNdK/0R6OnkK1qDrqVVhTGJV9UHKEKHpe0 7i5AYinSOF2iw2QvKFmsduizd4BubLN7FtwJ/0A0VEdNKeXakb60gKROh w==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="388982630" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="388982630" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:00:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="601296091" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="601296091" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga006.jf.intel.com with ESMTP; 03 Oct 2022 10:00:58 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:57 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:57 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:00:57 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.43) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:00:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a4aQEF/qaAg3Dc+visDvS3TBvY4FsUvU/v7ET238eweON1FxoO2CgSOklzFj1vzCdW60mIYuWrMBYsVOXO6JkxZ7kBawnwZSbYjsHyI1rnIPG+B3zRaG8FhxUWmmyrJSi98ggqnGHsduuOnhVaI800/dSB8ma2skonY0Dw6ROujun97/OfM1HM2G8ws9EYtczxr/T1FxjY68VAUP4RCM6wX9MeORnsxgLhZNvDS3y3fK9gQsO2NhqUcMbpIlGUtWFPQ/cKGz8bar4dso22KEYO6KVQPimqsMuRKEVXh8nzoSnTHGNB6uxiSpUjqznOhXfCRQVpNIDT7f4CM5kt/sRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9AKEGV3JiZ9jz3RJp6JGA4JUwvxlEI6Jt12uKNBT8i0=; b=a5mehyaKmeAMgFqMreo4ZOcY3POiIk17TZjJCtQ4QuleBieckWOPfLgkVmM5TbWWo0iiuZbVIoTgOM2vslcwUqq4DeBgMb5MjFnNDKk1WHnl1NfHPz6jrYqpNFQk5ZOAHRuFXnCEOjVf3rjN3JrSa/Q0fuMYpcIypUrzarvOcqEiFtEpta6hqB9+b9S5lsC3F6lB8t9GWonWPH6/iK+Vu//94K5YbA6OS2aAa9DyqE6IfYAXZf2gIqpIH4PIqtZp0FAPQhwlOwhXi+lWhthjUQv3VyvK9grDvFzmWQluouJAtn4N7LOeFrv6zSmVYqDnTHDQf8jSd/oLfAVK16qIww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by PH0PR11MB4870.namprd11.prod.outlook.com (2603:10b6:510:34::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Mon, 3 Oct 2022 17:00:55 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:00:54 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:20 +0530 Message-ID: <20221003170024.195223-4-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0196.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:e9::8) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH0PR11MB4870:EE_ X-MS-Office365-Filtering-Correlation-Id: e542b5b9-2e5a-4b88-a611-08daa560d57a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LYUCwXDBEOZaByU0ErGGiuBIxi6zHq/T3TrQL4VN19LLMg3EJYJRilDbjW+QyM+NDivJwvxsla3fF0fUzZgUwGSQmP75/3yRseLCYS6D7itUGc/Up46g2Yup9ziZpRUD8WoGxhWXqmFUbR5yEzyqBcSf/DwFQRwy1dupbrDvqTlkh1yNiokcUwFw7wolk9RKFHIRiaX5tlup2a705hdJdtwU8wwQRWyRG6Ky/9VFrgURS1NsXL+ReM3873jsxouTfi/uf+VRT75SCw3t029LmbYcBK4F9p50l5xb/FRxn0EmAK8Qu0htk6g8rcjDjl6VwLmMPROaSR9y8X8eObK7PwEqRpUMZ/Q896VzRXEw8nE7aOe5lfqnt0HIDzNSRtziGyB7E8Bn67BqJ4/JO3KNsXX7fv6t41Sm7985D6dZ6zcUpfrxU0UMgmw4HAiIN+bhBYzHU0mzmzvy1Bx4Lfysk49gxHLoX0s0CZa41Yo7II8vHMDZn2Orz7/+VIONBQ/5BQ6A4HjcPU6H6S750FPkFCgBVOtqukoFVhIx6M3CC1NH3DA9VewqmwmaAfYfD2eZvgs81v9jj4UvQ6oSQswIG5SaAJCPY3v+3M5TCL5Br4SM4NgfbLimg/n0PxF6BQecOWdw2F78XgY7p/oB4Wi6lG9qA//dRWC7sa6/eP/+WvurPa+Xz0L65nmmkbt+EEbSp1k1Z7yPvT4EQD3KmYpskQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(136003)(39860400002)(376002)(366004)(451199015)(26005)(6916009)(6666004)(6512007)(6506007)(41300700001)(54906003)(86362001)(66476007)(66556008)(66946007)(4326008)(83380400001)(36756003)(316002)(8676002)(1076003)(186003)(2616005)(8936002)(82960400001)(6486002)(44832011)(5660300002)(2906002)(478600001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lBIDL+DL1L6LlTFWJ9nhsvN1ucEYOAPkq6du4FrKC78BD1BcymtJNXlcyKkpdteTE58OWwRfutEa5jjOPpPeap/5+zLbp640NekMvuDKzlKodbz1hm2dUE6GfnmQJ6Q45K4VRVj6RcvqxNbUbfyeLjUnJmPI9R31dLINMhgBKJnyu1VcntuKHpHwQM50n7vvMRuKGHek48y3zfu6O9S8ZntNCFm1pPqVzvcEzKFhOuk3u96fzQVKvuED5CwMy50LpAHAd8i8CMoXxLabSc/XOiHBzYB1sIfwr3rSnknfa6vQIy0m1sIg7Z/wD0RZgfjRnk67baxaeXGQETRMNXT7swhYROCwZcucMwxW52WmeWS3abUWc2huLMmUrJdt8AonbyFIvU/yOZkcg8BfzuueBqQ0uPQQA9lLFOLEfD+qxCuXhzXM9PwMyzsqtkz8nL//l1f9Cj5L38yqGn+J02pl5lvznPiL4rtbjcfhF1dTPVjWpNTEFzyIkNdss2g4L2cs4MiFSeyP2HHwKzZDVDGvspqOHq+WuPAQIRXr+0b3uxxy1fxMLeHtG4jXw+8J0m3JJEiVdPBtPJSYn/AjcsJvRNRW+9X0h0n2mLGQiLQeLmnlY620nTozERpwzQ+48Q/PkCIcA9I/HQoQR1KVm3NHStAh+w+RI4qhmB7H0RKjmNBu42+gCdB0JArWOWAo/oLYq0kM05dq7+z2taSkljbI9UHCjR866JXIDNPRECuaWSOOpKlZk4MJpm05/iiD8D9QWmagHud3hUBTT5men1lYrIjKapuxJelgToLiS0KH3VJypNytsxqMoOyb6spVQtEtIHAUl9oP+dFS+ne8zdAg/sdtLDCuQa8sJHiuFDFEgQqbKvmRz6vC81obg1W1LVBRrVSHR6hX+R69TLjDkzalHVjRAON57I89QdHzdk5RgqsFiEQfh84jfYWhHXToQalrkk7CqPKyrR/KMx0jyFZjcBlT71CdMRjGW0kTF8Ttwd5E/Stl/9e4NC0iKUnXO2j58+PHD8Y/+ShmEggKvRvWFdax5KuwxhfLHW987DS6rdkqeg5hZYnWu/brQCjOvrKDqjl28VQO4hu6B/KdBvW8hDhH+3ooh2zex4HVtavuxbMGlmd0NaW2+4W+GmF+G0fGz6+AMARPcAkSo6PMNtdm76QdYwR6HfaTx0WylUyg49VralGDoHrIwdBzUHxMojmaoJQIi+ZjF3hBYJG3sdn9TY3ze9j6/Jm98sIB17XN6h+0D0lExVM37vO12y5Q1YaD5fkSIjbf/lfa8zHz+SsnGticJwnYv/HVgdZVsDvU2d4L3YlrjyVQmH+283OucCdDzH6OoXhGjh2kF4T4l/XsDn62miKCVG5267M7u9a6wKGJPqBdQXzDg5et10KAF1uEmhGNN86qwu3fiBOwGnTwLGdAbIQF63s6usQP3japaOmexnvDjM6+WchGSOvriQVPrKnG4X6UCN35/68G5v2bySegUCAwfYs9ccHJQ0F70yugLbDlVJg8x4lwMj3XLf5HV4fQa9PCbwSbPcJj24LaaKtEjtdy4uvcfAG0kt9vnxiBm86i2bpS7LgBGw9jKS606DXGAk/T3GK2rzp7tSLaFHRQEJ4JNU7Teg6ig/wfAXo= X-MS-Exchange-CrossTenant-Network-Message-Id: e542b5b9-2e5a-4b88-a611-08daa560d57a X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:00:54.4937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NVBqZ6ZKn2Ij99M3RV1T5ZQgeb2iEdOwPGuvbl31B7mN2i2f0CXYprUdFrEiFdiawNTary8fi0QdSdCNkXilwzRwtgYUCFzyVdku7Qf5rBMsku1Tf4uZzyCKQuDtjYKj X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4870 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 3/7] drm/i915/display: Define the DDI port indices inside device info 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" Prior to display version 12, platforms had DDI ports A,B,C,D,E,F represented by enums PORT_A,PORT_B...PORT_F. The DDI register offsets of the ports was in the same order as the ports. So the port enums were directly used as index to calculate the register offset of the ports. Starting in display version 12, TypeC ports were introduced in the platforms. These were defined as new enums PORT_TC1,PORT_TC2... The later generation platforms had DDI register offests of TypeC and non-TypeC ports interleaved and the existing port enums didn't match the order of the DDI register offests. So the enums could no more be used as index to calculate the register offest. This led to the creation of new platform specific enums for the ports like PORT_D_XELPD, PORT_E_XELPD to match the index of the ports in those platforms and additional code to handle the special enums. So we want to make the port enums not tied to DDI register offset and use the index from somewhere else to calculate the register offsets. The index of the DDI ports in the platform is now defined as part of device info. This patch just adds the indices to the device info. Later patches in the series use that index for offset calculation. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/i915_pci.c | 46 ++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_device_info.h | 1 + 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 38460a0bd7cb..b37a95755b77 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -132,6 +132,42 @@ [PIPE_D] = TGL_CURSOR_D_OFFSET, \ } +#define GEN75_DDI_INDEX \ + .display.ddi_index = { \ + [PORT_A] = 0, \ + [PORT_B] = 1, \ + [PORT_C] = 2, \ + [PORT_D] = 3, \ + [PORT_E] = 4, \ + [PORT_F] = 5, \ + } + +#define GEN12_DDI_INDEX \ + .display.ddi_index = { \ + [PORT_A] = 0, \ + [PORT_B] = 1, \ + [PORT_C] = 2, \ + [PORT_TC1] = 3, \ + [PORT_TC2] = 4, \ + [PORT_TC3] = 5, \ + [PORT_TC4] = 6, \ + [PORT_TC5] = 7, \ + [PORT_TC6] = 8, \ + } + +#define XE_LPD_DDI_INDEX \ + .display.ddi_index = { \ + [PORT_A] = 0, \ + [PORT_B] = 1, \ + [PORT_C] = 2, \ + [PORT_TC1] = 3, \ + [PORT_TC2] = 4, \ + [PORT_TC3] = 5, \ + [PORT_TC4] = 6, \ + [PORT_D_XELPD] = 7, \ + [PORT_E_XELPD] = 8, \ + } + #define I9XX_COLORS \ .display.color = { .gamma_lut_size = 256 } #define I965_COLORS \ @@ -562,7 +598,8 @@ static const struct intel_device_info vlv_info = { .display.has_dp_mst = 1, \ .has_rc6p = 0 /* RC6p removed-by HSW */, \ HSW_PIPE_OFFSETS, \ - .has_runtime_pm = 1 + .has_runtime_pm = 1, \ + GEN75_DDI_INDEX #define HSW_PLATFORM \ G75_FEATURES, \ @@ -733,7 +770,8 @@ static const struct intel_device_info skl_gt4_info = { IVB_CURSOR_OFFSETS, \ IVB_COLORS, \ GEN9_DEFAULT_PAGE_SIZES, \ - GEN_DEFAULT_REGIONS + GEN_DEFAULT_REGIONS, \ + GEN75_DDI_INDEX static const struct intel_device_info bxt_info = { GEN9_LP_FEATURES, @@ -887,6 +925,7 @@ static const struct intel_device_info jsl_info = { [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ }, \ TGL_CURSOR_OFFSETS, \ + GEN12_DDI_INDEX, \ .has_global_mocs = 1, \ .has_pxp = 1, \ .display.has_dsb = 0 /* FIXME: LUT load is broken with DSB */ @@ -984,7 +1023,8 @@ static const struct intel_device_info adl_s_info = { [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ }, \ - TGL_CURSOR_OFFSETS + TGL_CURSOR_OFFSETS, \ + XE_LPD_DDI_INDEX static const struct intel_device_info adl_p_info = { GEN12_FEATURES, diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index bc87d3156b14..a93f54990a01 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -292,6 +292,7 @@ struct intel_device_info { u32 pipe_offsets[I915_MAX_TRANSCODERS]; u32 trans_offsets[I915_MAX_TRANSCODERS]; u32 cursor_offsets[I915_MAX_PIPES]; + u32 ddi_index[I915_MAX_PORTS]; struct { u32 degamma_lut_size; From patchwork Mon Oct 3 17:00:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997682 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 6787CC433F5 for ; Mon, 3 Oct 2022 17:01:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5FC3410E41B; Mon, 3 Oct 2022 17:01:11 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FC2310E3D0 for ; Mon, 3 Oct 2022 17:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816467; x=1696352467; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Oo2+pv38yQhIDSiN5SEyT/ElBKthbFDnsuWJhvP+kZ4=; b=BGyOKLOGDCgjBW4ibwNh9ZvlnTrF31xrTyccnoOz7tb3d3PLK+TOkycV q+Q2Bzt8HJVtaVIHLYJl6JeNAFhOB8S7VBEQ1g7ZpNonwV+S6XTdPwUDc 50hx5d/7wbaY4ArjegNo+4Sb469EMJvyZBCzOEe3igQBGEvSGlkmKkG6v OdnHVQsQ6Hb6IX8qMvdGhoOhCkMb4Yy0p1znZCFHNjIGLQOrWYXp1ytTC xVouV2PCUr5zWY9JbEE5ha8mCUx9luCX4KZxzNLEPlUl75VTUclm6dZQu pLFFHb4xzVWkFhDGIHxr0+SlObnBuQ1aYLFKvshsTZaRN1LwvEpYOxPin g==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="388982683" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="388982683" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:01:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="765997211" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="765997211" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP; 03 Oct 2022 10:01:04 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:04 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:01:04 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.49) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j1JBd6hd0XTV4nm/ahYCAUOn7CcouCf5yQOtfnbFLvh/qViA+T3lfD1w2O3cTysYNq0PwKC0+jfjVAf8w6QZXV4zaQf2fQHI+/cpyRkrvnbJxPWY/fPQGzLgDxcByvlT0MJC0a2cvbgHVUFR5exQzeCxmRbFggTgkoN/K5cXwc0EmNYPYHJ24XxjnGTxh3ZaExahkPnSRscKt3b+htfpnurffR2vBQEQsAjupRpAvDHSRxI+WYj+IS+rnnTjNJlPFWsQWroi9tG/cMQg9uJQlB5Y7AUP64gaTSrlWK1yykNqjPNyDiL9ypi/xNok66x4VUjIhBpjhpEQCaO5bVmCEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FhaYfzQYMpV+2NtFhwq0Ey/kCymRb2+q/DKL+9CfaqE=; b=g27KemSmGuvhl8hD6dYQBz1z8xmECREF+4JJzn79+jKYBY8TH1gJtG31I8DMjjhpdOHPF83HxZDbNMRLlLKxfazj7ssepRXuh4KcSoVHr2nyYLdeo7fb98PXVXomWEb3G2rbLNnW2QjHhQD5AjA3/nxVxD0S/b41/PfwxU9V8IA3uyGbTlfWne7DQh7D5OdOtFK46QTL0jc2FzZzI4a+r4pJbK0QD7jZ/eYWiVxEVS1dwc7cPAkyFLBhU9ZPq/h9X10aW5gAI6dXer7B0gOb86c79/HYzLfFw80BfTofuwGnQmhGHD27qdhb9rC+qVObvkHAxqRWgslbvzqonkY5ow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by PH0PR11MB4870.namprd11.prod.outlook.com (2603:10b6:510:34::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Mon, 3 Oct 2022 17:01:02 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:01:02 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:21 +0530 Message-ID: <20221003170024.195223-5-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: BM1P287CA0010.INDP287.PROD.OUTLOOK.COM (2603:1096:b00:40::20) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH0PR11MB4870:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a5d5ce8-3382-4d9a-bc29-08daa560d9d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OAlQ/7VUfHqgoIG8usbUn83X9j20GWcaaWVDe0m9tfpn07wNOY32ZJduH8Y1/jx7Y7GaTyr3OFtW/oWk0CvogRpTRDGjogwUkmYw0uJ+C5zySy0SG5Gncdr09zBKBe+jKaW72fpJGPapXiOUTDzKu74vDcKox/B4tJx+UO0An/Gh/XCZoQ3Fv47g6MQMgA6/e6U0OxjGZW44PRJ/wbICrQDG+Bp9JtkECqiiSzkXisFseVXBXtCcUoUCURqYYHUMnS4IZYXtm8btiFkX6ty18nha5kHwsiZ0LV2Cn0EsSAidLXSE5RDAJDQ0axD1/oqqLrCMk9a3+B/qV81gPv47WQwCLjbCPAnsAYUrZHTbGzEtypcMC9NhtAVxN+HBpDFskqNBbJfB8acLKDL1hTxLeoCh3Z7dh271b0ELByCw72W9VfDWYNn824RLbEpAEFCONmJRE19RIw+IQE/J1otIiCK9WlFjBprS6oh58BTxkeX/wuOahUZFT42tIRAo8WCIBdAJHammaeusgkJFrdCM4An1SRrUnbHW76IgfWDPIk7+H7X6o/HxIyhkAdBjJksSQhqA2J2oy3x1ibLD57RwtCf4D47AlpjI0cQHdXZ8duPGSm8+9V8KO4PPknu5xjAT5ZvI22I0tnS7rmFTnJNaTUrXq4bPxIHlzLIoxukk4BU/zsOqh4+18WnTU30Z3RrPMCJHZ2p1P5Z72+zeLBLbsQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(136003)(39860400002)(376002)(366004)(451199015)(26005)(6916009)(6666004)(6512007)(6506007)(41300700001)(54906003)(86362001)(66476007)(66556008)(66946007)(4326008)(83380400001)(36756003)(316002)(8676002)(1076003)(186003)(2616005)(8936002)(82960400001)(6486002)(44832011)(5660300002)(2906002)(478600001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2yZMcKGda+//SUhRuY2pvQNDP6tNoIGP0Fa6MpWO2qeZHqY0z8n75HrokyuLRBZjzgEuucPFwjLTuXRNp1g88sQYEh54Kd5tHKfdLxa9U7i3vEbvr1IlMYlSfFXeJHmRFHLJ0CkKS1BLklmZmc5VsUgU1rX9Eel5DTbBDsMtTRzTzrMev2JXY+W+jvXJxDFrhIx6ayh0WE0k1tpjDs0cmLQLw18il8Vq7UWZ2sP+cPsL6K3Tk3OHN6+2fEIxLO1PoE49hxKN+WQBZCR7Kz5ah8K+EfDjiw8BkIHzZbEjRVfFp7gT2TbgBew89mPOihLkSUtcDRSH+oRoZzZ2+XamANufXqoLbW++Cmx4zJtetuIlb6NwW3rdFKP0ffaBHcsnZbREYlvKcKSIYGzLxF+rz7S5eI2Ww6k0ZHuEC0AGnWugS250ysgmEw9zGxk7UmpI+q3FJTBcvnhk9mYBiTBIiNZdMi6gH7LaizSev/rogcc87EVL0bc3vsmTbV/wRUaWl7on/It1k7ELHQUvF7kL/p4RYf3+v9r4bpwWeYaGxnjGFPepwz5EVx1oXDKUw99T+hDF2ZIr2V9ip8At/0+95x5Y9nuLE7XnJdJwxCEcdxizUEOIh06sN2mA1ZKo3XkEE5suLu/C6gdDHGCK9xogFzlanTrlwt6uNa+9bmkO5wkuCCHnphOTOSHF10x9SYzcypcAZRpFNE1bB0V1uB/Ufmtx35eT+RpRhR3x1P96KzygS3mZ6mRANaDnFxGeJOCGNVcyBWDT2JV9tSYWXamL9/y+DdsY9iQQ8nOIZpoTtL6NH/Eh6y3Lpll//uCH7r4BGEa/Mkhbn1Xdb2PDsgHEd86IeqFKnPCEka7KLwwBx/RFqsHMu3ElyiuhjlZ3bXsQRkcNppFVtxAYFMeDn5XUUplLhFzZwF/n6yzAY0sKkJEKqIwpT0C0y8pMLJubMI4xg6yA/95s72NJa6co2vDLh6/iSpuCGPz5yS9/E7hMBugvot1K/zNdpHdBOZNq02bzl3hbjpjmag5Lss8eIDBtT676B1KJ3/FbY/U2aF6R1SaMvU8kQHLvV5NoT73Gsr+4YCg94oZ2TL7vCBYElqmWKOnQW3/JXF7ppXhubH7oVlKimnQ+Vf06HIJfJswLRmULod17VoVOn54CylG3EByKqTXAmqEs+hEYl/8Iry77uqFbDqNPYoP3i7iSkmQUErz9ZnaUaTx2r2PuywJ5ouhXJroMgEVEQo2RfQhoocdeZ9uFlugWFNUNb3PyEPTElh+qJur5pUgVQJfgx7szMh2fHCXtTwdUZspdxA9FU2x9bn6JBj/5T4zehuZJNGsuTCdow+CBWK6OBrrNk7R+dAcCZKSoGniQEFEG0FuVnuukhtCNSyOgyeFTQdwJk4b2paeXD1s4KQ5+Co6BZCn5jHM1Vp6G0SIlXdI9ZVuizpfjEeEniauy3u6a7Lbbb8L0OqCktUnaeGMNWm84XgifMpSqRbJA577civxKmbqz7RRkrgmvxBy/hC4cVDuctR8W30XfaKGHzpqsIhwrMWhMtn0J69g02jcQ/C3qlTZqgHcMep8b5rPArNUBaeu0dIOx4JccA7LiWkY75PHUsGAoA9RsU/VnaFiv4r4AryCgukwsME0= X-MS-Exchange-CrossTenant-Network-Message-Id: 5a5d5ce8-3382-4d9a-bc29-08daa560d9d8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:01:01.7899 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bi2ntJq2pTfO3c6eUDRZ0l0S8FrtOIav6UMnggA8xKUsErpM773KsnSNzscRPlPkeqO2Us6clHeFa7WvyvYjHepLmBSr+1Ci7UlD8D76RMLufibj0cpCrB0fHLrZoeBb X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4870 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 4/7] drm/i915/display: Free port enums from tied to register offset 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" With the index required for DDI register offset calculation available in the device info, the macros which used port enums to calculate the DDI register offsets i.e. DDI_BUF_CTL and DDI_CLK_SEL are updated to make use of the index rather than enum directly. Any new macros access that DDI registers should follow the same procedure. This would free the port enums from tied to the register offset of DDI registers. We can remove all the enum aliases and clean up the enum definitions. The key target of the patch series to remove platform specific definitions of ports like PORT_D_XELPD, PORT_E_XELPD is not yet covered here. The definitions are still retained and will be handled in the follow patch. Removed a WARN_ON as it is no longer valid. The WARN was added in the commit "327f8d8c336d drm/i915: simplify setting of ddi_io_power_domain" The ddi_io_power_domain calculation has changed completely since the commit and doesn't need this WARN_ON anymore. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/intel_ddi.c | 1 - drivers/gpu/drm/i915/display/intel_display.h | 8 +++----- drivers/gpu/drm/i915/i915_reg.h | 12 ++++-------- include/drm/i915_component.h | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index e7beafafb857..74b4271063d1 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4493,7 +4493,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->update_complete = intel_ddi_update_complete; } - drm_WARN_ON(&dev_priv->drm, port > PORT_I); dig_port->ddi_io_power_domain = intel_display_power_ddi_io_domain(dev_priv, port); if (init_dp) { diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 2af4a1925063..9112833b39eb 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -212,18 +212,16 @@ enum port { PORT_H, PORT_I, - /* tgl+ */ - PORT_TC1 = PORT_D, + /* Non-TypeC ports must be defined above */ + PORT_TC1, PORT_TC2, PORT_TC3, PORT_TC4, PORT_TC5, PORT_TC6, - /* XE_LPD repositions D/E offsets and bitfields */ - PORT_D_XELPD = PORT_TC5, + PORT_D_XELPD, PORT_E_XELPD, - I915_MAX_PORTS }; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index acb764755338..15e6b9482ee8 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -170,6 +170,7 @@ #define _MMIO_CURSOR2(pipe, reg) _MMIO(INTEL_INFO(dev_priv)->display.cursor_offsets[(pipe)] - \ INTEL_INFO(dev_priv)->display.cursor_offsets[PIPE_A] + \ DISPLAY_MMIO_BASE(dev_priv) + (reg)) +#define _MMIO_DDI(i915, port, a, b) _MMIO_PORT(INTEL_INFO(i915)->display.ddi_index[port], a, b) #define __MASKED_FIELD(mask, value) ((mask) << 16 | (value)) #define _MASKED_FIELD(mask, value) ({ \ @@ -6936,10 +6937,7 @@ enum skl_power_gate { /* DDI Buffer Control */ #define _DDI_BUF_CTL_A 0x64000 #define _DDI_BUF_CTL_B 0x64100 -#define DDI_BUF_CTL(i915, port) ({ \ - (void)i915; /* Suppress unused variable warning */ \ - _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B); \ - }) +#define DDI_BUF_CTL(i915, port) _MMIO_DDI(i915, port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B) #define DDI_BUF_CTL_ENABLE (1 << 31) #define DDI_BUF_TRANS_SELECT(n) ((n) << 24) @@ -7075,10 +7073,8 @@ enum skl_power_gate { #define PORT_CLK_SEL_NONE REG_FIELD_PREP(PORT_CLK_SEL_MASK, 7) /* On ICL+ this is the same as PORT_CLK_SEL, but all bits change. */ -#define DDI_CLK_SEL(i915, port) ({ \ - (void)i915; /* Suppress unused variable warning */ \ - PORT_CLK_SEL(port); \ - }) +#define DDI_CLK_SEL(i915, port) _MMIO_DDI(i915, port, _PORT_CLK_SEL_A, _PORT_CLK_SEL_B) + #define DDI_CLK_SEL_MASK REG_GENMASK(31, 28) #define DDI_CLK_SEL_NONE REG_FIELD_PREP(DDI_CLK_SEL_MASK, 0x0) #define DDI_CLK_SEL_MG REG_FIELD_PREP(DDI_CLK_SEL_MASK, 0x8) diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index c1e2a43d2d1e..f95ff82c3b4a 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -35,7 +35,7 @@ enum i915_component_type { /* MAX_PORT is the number of port * It must be sync with I915_MAX_PORTS defined i915_drv.h */ -#define MAX_PORTS 9 +#define MAX_PORTS 17 /** * struct i915_audio_component - Used for direct communication between i915 and hda drivers From patchwork Mon Oct 3 17:00:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997684 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 5B294C433FE for ; Mon, 3 Oct 2022 17:01:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 779B510E43D; Mon, 3 Oct 2022 17:01:29 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29CB710E43C for ; Mon, 3 Oct 2022 17:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816486; x=1696352486; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=YHV4OalcSwVGUGNiAKGVQKC6txywL4ENTvWdQMBAbik=; b=aphu3Be/MDOmz2Tb3wiwhQsLq/tuHUZOLyeufY8nEh/Yz6iSJvwBzKd2 WojVl+AvHQB00iRdfD0NNSsBYIywHzOt+3p1mpmMpGLI7HWkzQXicpkmC LFE2v9qxHUAwvAux7t8e+1ECkDsubnruuxdE204StgAxHGRQHcv6kKJe9 9F1hSWwVdIX139AKWRJiuShppI9AmsrV3TkfqJpaAdPsa4pFrj1kQVEnJ lQ/VSI5tZckgJlMQE86uEF1wYdCEoZRhRETq1QHwSnD9uEGdIMHX2zfDn YwXNRKjqfcqFrMdZWjTxOYddqW8wtr5VRUEKXFyLySiHt8tYMnWpSM5ux g==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="366758574" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="366758574" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:01:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="798801587" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="798801587" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga005.jf.intel.com with ESMTP; 03 Oct 2022 10:01:13 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:12 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:12 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:01:12 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BzrfaV8B7mLBqQ5mud22HqvV2VSt+lZ2n7QvpaQqJoobk/i+GXZ3qSRAHJw8Ds3H4N65/WXZkDLxeOoMlhspZfIoV1zn1efqd7KKwHZke8GDU+XzS7pswAmgIZLEVKMMA27GerVilBhTMH31dH+h0vRTib0DhOs1q+BPjgts0ODx7fzriAjtU5PYxo0IRvGlUvBCpQahhDQ75UttZPM0Lx8UD0FcsHUIMnUkobAAEL3F6n9VmWBa/5X98z7xkzDhQo7WDagiFYDfqAqbnHQVcIbPplA8IuU18CQ8FPRo9e+y+QbsLwS3w9Ry063SeLV8qXEWcD7iO3fbvb+WlWsKdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PRLHO2THRlZlbpO1BExAEz13ALiGP59M7zBEe9Su678=; b=nWwDaWnfoAGVzk50Y6yNPEIPhpA3KFHXtbjK6pfVfce2R87Q8EcrhB6VHNuWqB+oq1BPFsQp+arTNaCjt4Wr73rCIeRnA6NGnRbtbg9zfPJYMIzb1v6/3umlZ2lhZZBKvXy8xzfJNLwm/D79hwu16HsbZDxXh+IluF2Pfg6IdEAwqPkjLEZy+WaUl/Qha51+EvJcpR/Nb5IQLuODMobL6a3GVDzzMPS1iFVNdA8HokFweWjZIZrIqv0lwa4NGmnHheSVTs/WM5XrJAHMbdiscMH4txu5v/BZrq/MwCDZZGKQZphPPSxPg7tinMKSVywIzJDeFU7WEpoRSD6i73XNqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by PH0PR11MB4870.namprd11.prod.outlook.com (2603:10b6:510:34::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Mon, 3 Oct 2022 17:01:09 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:01:09 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:22 +0530 Message-ID: <20221003170024.195223-6-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0172.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:de::16) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH0PR11MB4870:EE_ X-MS-Office365-Filtering-Correlation-Id: cc643ff6-948a-4a49-48d9-08daa560de2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VExA7G4MB3B2YE+38Ke34IUipAad/B0+uBFwvops+cwjUSOVvwYntCYANXdLJ5iIQuol7bysoY/BRE8wD4KMRZTFaTO1TVa3K5qQcRpAEzInpnpkpyTtlCdJWG3X8viMaSZBQXoHNvl33Gxj+l2CTCDB3btDIFNpEWUeSIh2Xy5pl9zYWbL/j/Gmyl1vjm4xOQJlbxD9kl7O1HY97tG1LRFrsx4Tm/+AEjkW5nhHFy56JcEGj9ACKifWb8wCxRsPx5dsk7dSr+K0hIR/uKLeRjUi/W5iEbnT8+un9ITx+mwPgnVOV8x5w+tuns9kXAkvDC6jCUmRf7/gkkNzdCy7tGW6NbITQ0X8og+/JCkjuwguCwqMYR8yA94A0mFZPXXEH29JHQKJjNoxxK4NtSvi7Vh75ABd/VI2AsNq40HwcEeJ/CYCE4rZywJTuO8ARATgQc2M9u4tsgtrbUo69dYKqiFSXy/33BCTbdEphQREM9YJEClthhDBYqTN7W0vxlR7DLlqJs+L0mntKfGUsQF9iyT1ZU5jwYH4MXpvvJ7EGvv/GzGK6YeAf59Cy/idsr6CBgzzf75z+vc68OMYyZw9k9hSMOgl+Hx8HGTSYerUovEhX5tyUHcobB++IQMvZI1kw4sP6JkdeR9hyqDf5dHbZ5aDaq7Fo5CYjwcP8BrcZ+jis1bVAqwBc2Pr1Usk5BaEJb42lpVcmJQW/3U77+DaWg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(136003)(39860400002)(376002)(366004)(451199015)(26005)(6916009)(6666004)(6512007)(6506007)(41300700001)(54906003)(86362001)(66476007)(66556008)(66946007)(4326008)(83380400001)(36756003)(316002)(8676002)(1076003)(186003)(2616005)(8936002)(82960400001)(6486002)(44832011)(5660300002)(2906002)(478600001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b0ljmZMHo4bpCzkxIn6THiA2wvnm/a1shbe7YFShlPcNQWZUkeOijsRM+WdcnhAqxT9cmNbGZHVb/MFwFnBlZeItuAVB3yKUxgG8mZB+/b3E8i0CG1lBFiG7jfZPwyTIabbTz++j7WuJQaI3tO0EJJvxqBrklVBcVjdwGESWPitl4UbEs41NyznpJSBn9A6pV3NyMKkSgr6b7mpyKpVpUvjjwrs28s9NbeDEYnaWcADkcJI/itg/1SfNXU2Qcwet3la6gR399OapnL/hy28D5/KUh5qTeKhhHNXTurQzrTNgrsv+2ZO8rxXarrKDPWbwJ02PWffGVFEh7Xz+WvLuIFCiQSM6LMdxva240avkCbFWsT4Er7oS6KDPFeovJhQNK5Na9XjTMz6BDU+xFUH7FUOidYZ0LW0JspKxXG1bbX47HDdRf5Hzddt3IvSzbpggkXOsWcWii/jhon3kAWQbt885Pp/Glryv0U3sKClmPMAVejXJf0aeQdtuQ2icw7JEYoZfPz4ahiAnm/uKKnmJaLQ1tcnA7MlMNm580lEW7D0N+nJqlVxiG2tc4ICJLsikZMbTNiy9pa/7lzHTdhLrZe2I9roZwNLmrLmbvpE1cER0Z8oBWcHqz728YJlJ6Y+x1OowPFbhRZIIuRMUONlNkxuv8E4a0ihpMKNlNGwNIqemokB0kZQIya5zKcqPK1cR4G5jR1Cj/9VWC9tV99u+a2sxMrWxpFn4kAGZ4Nx2k8pBrdMplL/s+j1rAYWODTLkUVp+xOvGB9aaCJC4C+obfEYB1JWFKZYvx5HGjP3QbDqRdzp26Vj4Q4NcjD/zoLMSvjUyqIzEkDQ+KdSCKfKn10ttF4QY+Eooh36g+gzh8tCtYPz+creADl4w31B6vrd6y5PU5mrTFj73ka919IvCU1NTGxGVfh9Fnr8vDO7vv1bzVKhckfAf61vIMR3yktrrDmfWCGJ9XTb48vx4VSkkhAQmjRwrTVyyhUjgsA3JuInNpxeisQBb3XbDH1Zhg8sqvQne+Oyh7sU2b0g+WC2SOiOro3aJSQf4Fur1cCrCPh3sJDwLymaOre9Z80yBg8jNHq5qnDtV6oXfUAidi/pLQ2Ni7nSyotomS40m5t2ofkKp9GCYMVxR7paDlmu3g+4duZrtdJr9B2C5uTfWLooBQXIiGPoNVXdXAQRO3mm7noHRByeSR5Xniv9Qpup6i7Jhp0xfMvTe01cJCGh5ubS1eA92V91g6mMkxjfVLXdew3wHejRzfLIHn92jpaXcg1iDfp7rDeAqo3BOSOosexUugXPRmkleKPEn3DxTjsL/B9ELRBZYxLR7Y1Ajk4WoMQ++gdiVNyMfu4vvQHig61jRovLlW/ZSUn7+7CQA2rNDgSD+GmkMUdeC5/SnP7Ilrkatjh+mgdX82BrJGQ4FrCVQDtrffZPCkyftwyu9VJr3ycKaPwdnvrpqiH0maI1uISYD2NRptCFBj1upnHM8L1fZW755CEMt5YD8UM+CO/XX/D4woBmqdlFTyF/MZ7A3IVY0c5IZasdx+PQhZBk9iAn8HGH6iBUWQ29apkWzmE0/Pu5N2z9N9rTDpFBeNNCxvTW5kAcUc/US5oRx07LdfbbC422DBwfKTLsS/G4OXGMMKe4= X-MS-Exchange-CrossTenant-Network-Message-Id: cc643ff6-948a-4a49-48d9-08daa560de2d X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:01:09.2580 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2AK86IzoHgCUAY7vSR2Ig8FJSDzNB+ZIW64GGZHuhMtduROupsCARtE1LO5f5k7zROfOsPwN+2Js+yW1emqDNMXe3t+iiE9qHbEncnGhCNxviwVDqDcfHnoW4+JHjv+M X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4870 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 5/7] drm/i915/display: Remove PORT_D_XELPD/PORT_E_XELPD platform specific defintions 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" Port enums are no more used in the DDI register offset caculcation. We can remove the platform specific port redefinitions. Along with it we also get rid of the code required for handling these special definitions. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/intel_bios.c | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 23 +---------- drivers/gpu/drm/i915/display/intel_display.c | 6 +-- drivers/gpu/drm/i915/display/intel_display.h | 2 - .../drm/i915/display/intel_display_power.c | 40 +------------------ drivers/gpu/drm/i915/i915_pci.c | 4 +- include/drm/i915_component.h | 2 +- 7 files changed, 10 insertions(+), 71 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 4c543e8205ca..ab472fa757d8 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2436,8 +2436,8 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915, [PORT_A] = { DVO_PORT_HDMIA, DVO_PORT_DPA, -1 }, [PORT_B] = { DVO_PORT_HDMIB, DVO_PORT_DPB, -1 }, [PORT_C] = { DVO_PORT_HDMIC, DVO_PORT_DPC, -1 }, - [PORT_D_XELPD] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 }, - [PORT_E_XELPD] = { DVO_PORT_HDMIE, DVO_PORT_DPE, -1 }, + [PORT_D] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 }, + [PORT_E] = { DVO_PORT_HDMIE, DVO_PORT_DPE, -1 }, [PORT_TC1] = { DVO_PORT_HDMIF, DVO_PORT_DPF, -1 }, [PORT_TC2] = { DVO_PORT_HDMIG, DVO_PORT_DPG, -1 }, [PORT_TC3] = { DVO_PORT_HDMIH, DVO_PORT_DPH, -1 }, diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 74b4271063d1..0b6f884650d3 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4134,17 +4134,6 @@ static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy) i915->hti_state & HDPORT_DDI_USED(phy); } -static enum hpd_pin xelpd_hpd_pin(struct drm_i915_private *dev_priv, - enum port port) -{ - if (port >= PORT_D_XELPD) - return HPD_PORT_D + port - PORT_D_XELPD; - else if (port >= PORT_TC1) - return HPD_PORT_TC1 + port - PORT_TC1; - else - return HPD_PORT_A + port - PORT_A; -} - static enum hpd_pin dg1_hpd_pin(struct drm_i915_private *dev_priv, enum port port) { @@ -4313,13 +4302,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder = &dig_port->base; encoder->devdata = devdata; - if (DISPLAY_VER(dev_priv) >= 13 && port >= PORT_D_XELPD) { - drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs, - DRM_MODE_ENCODER_TMDS, - "DDI %c/PHY %c", - port_name(port - PORT_D_XELPD + PORT_D), - phy_name(phy)); - } else if (DISPLAY_VER(dev_priv) >= 12) { + if (DISPLAY_VER(dev_priv) >= 12) { enum tc_port tc_port = intel_port_to_tc(dev_priv, port); drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs, @@ -4449,9 +4432,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_ddi_buf_trans_init(encoder); - if (DISPLAY_VER(dev_priv) >= 13) - encoder->hpd_pin = xelpd_hpd_pin(dev_priv, port); - else if (IS_DG1(dev_priv)) + if (IS_DG1(dev_priv)) encoder->hpd_pin = dg1_hpd_pin(dev_priv, port); else if (IS_ROCKETLAKE(dev_priv)) encoder->hpd_pin = rkl_hpd_pin(dev_priv, port); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 8681055843f0..febe85a8a9c8 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -2135,9 +2135,7 @@ bool intel_phy_is_snps(struct drm_i915_private *dev_priv, enum phy phy) enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port) { - if (DISPLAY_VER(i915) >= 13 && port >= PORT_D_XELPD) - return PHY_D + port - PORT_D_XELPD; - else if (DISPLAY_VER(i915) >= 13 && port >= PORT_TC1) + if (DISPLAY_VER(i915) >= 13 && port >= PORT_TC1) return PHY_F + port - PORT_TC1; else if (IS_ALDERLAKE_S(i915) && port >= PORT_TC1) return PHY_B + port - PORT_TC1; @@ -7907,7 +7905,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_C); - intel_ddi_init(dev_priv, PORT_D_XELPD); + intel_ddi_init(dev_priv, PORT_D); intel_ddi_init(dev_priv, PORT_TC1); } else if (IS_ALDERLAKE_P(dev_priv)) { intel_ddi_init(dev_priv, PORT_A); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 9112833b39eb..62604cadf0b8 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -220,8 +220,6 @@ enum port { PORT_TC5, PORT_TC6, - PORT_D_XELPD, - PORT_E_XELPD, I915_MAX_PORTS }; diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 1e608b9e5055..494821711775 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -2359,50 +2359,12 @@ d12_port_domains[] = { }, }; -static const struct intel_ddi_port_domains -d13_port_domains[] = { - { - .port_start = PORT_A, - .port_end = PORT_C, - .aux_ch_start = AUX_CH_A, - .aux_ch_end = AUX_CH_C, - - .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_A, - .ddi_io = POWER_DOMAIN_PORT_DDI_IO_A, - .aux_legacy_usbc = POWER_DOMAIN_AUX_A, - .aux_tbt = POWER_DOMAIN_INVALID, - }, { - .port_start = PORT_TC1, - .port_end = PORT_TC4, - .aux_ch_start = AUX_CH_USBC1, - .aux_ch_end = AUX_CH_USBC4, - - .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_TC1, - .ddi_io = POWER_DOMAIN_PORT_DDI_IO_TC1, - .aux_legacy_usbc = POWER_DOMAIN_AUX_USBC1, - .aux_tbt = POWER_DOMAIN_AUX_TBT1, - }, { - .port_start = PORT_D_XELPD, - .port_end = PORT_E_XELPD, - .aux_ch_start = AUX_CH_D_XELPD, - .aux_ch_end = AUX_CH_E_XELPD, - - .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_D, - .ddi_io = POWER_DOMAIN_PORT_DDI_IO_D, - .aux_legacy_usbc = POWER_DOMAIN_AUX_D, - .aux_tbt = POWER_DOMAIN_INVALID, - }, -}; - static void intel_port_domains_for_platform(struct drm_i915_private *i915, const struct intel_ddi_port_domains **domains, int *domains_size) { - if (DISPLAY_VER(i915) >= 13) { - *domains = d13_port_domains; - *domains_size = ARRAY_SIZE(d13_port_domains); - } else if (DISPLAY_VER(i915) >= 12) { + if (DISPLAY_VER(i915) >= 12) { *domains = d12_port_domains; *domains_size = ARRAY_SIZE(d12_port_domains); } else if (DISPLAY_VER(i915) >= 11) { diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index b37a95755b77..45eafe447546 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -164,8 +164,8 @@ [PORT_TC2] = 4, \ [PORT_TC3] = 5, \ [PORT_TC4] = 6, \ - [PORT_D_XELPD] = 7, \ - [PORT_E_XELPD] = 8, \ + [PORT_D] = 7, \ + [PORT_E] = 8, \ } #define I9XX_COLORS \ diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index f95ff82c3b4a..4b31bab5533a 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -35,7 +35,7 @@ enum i915_component_type { /* MAX_PORT is the number of port * It must be sync with I915_MAX_PORTS defined i915_drv.h */ -#define MAX_PORTS 17 +#define MAX_PORTS 15 /** * struct i915_audio_component - Used for direct communication between i915 and hda drivers From patchwork Mon Oct 3 17:00:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997685 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 7D237C433F5 for ; Mon, 3 Oct 2022 17:01:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C2F6E10E434; Mon, 3 Oct 2022 17:01:38 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 943BA10E43C for ; Mon, 3 Oct 2022 17:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816494; x=1696352494; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=axpCy/cvmkX/nPyW7nDkGmLqafnYae9FB/kU22RDNvs=; b=CSYejwvP5XChK5YZMyuApEuZyDwpQds8kyg6ww+BEYE3DOb08YyWW0bX snMiB5wHzWE/SBde1an8iQY4Jt31t+v4wyYiqU29DcEB7+4fDAYfIiyYQ 5uvtdURYN3A78CQOFMhKsUjeFa/7bpnjNCDB4X4uHlKPjtC1sYAe3duJ2 9AJXi4wBfDBYl1Hqo7f6GtPyWFdbrLOiX6IuZWNdv5zLeHUjiv5qHU+xY oLVhZ5nhPFh+fxYb51O8sh7c7jAf4b8H5FaBFTW5wczVuEFLR80ehgOCX pJaFySF2JhpcLyEze+LRVbtdpBGD6enXXbyEJx1ouNRRu9xpDMWcVUF50 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="329091886" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="329091886" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:01:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="692141024" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="692141024" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 03 Oct 2022 10:01:19 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:18 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:01:18 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.46) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBoGoHPX8rz58quYDoLd00dlR8PESEwTxpO1N3oDhRJ2CjOGcLfWnTQFLJ9shBSwrj3910CZNw+MAnKBC9IhE7YsLp/UbxYSeLc2UTNcMk1W4gBNwVEDDL8yvgyt281N9Y5MrmqXDjhS3/g4JWovTx0GbWH2ES+FdESbqo8MCAwYt6SXDK7b/tmhlelbstkeP8GuVi6pqpBBeaJGDnjowqC7cO9qdBAQXplRXXkXiFf5rvgxo85tN3u+EUu3XtfO9QtZpoFOauGSmnc3PTdsbo1yua3eFX+mpdO9o6s3ugkD9K5LtkouDSfY70cQA0hanEtKbDpxAdyrIR5Pye4JmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VRMBqPWpEV4xajyxjb92OC1osBEUvd+wrmDWaXKHyDw=; b=MFlrJDeWS6TeDRNvsamF2nG3rDKiSY/XiDoczy65cUZwvwLHfBhNkSiVNqQ2eXNhJKgGXhutvgyutaMJ/xi5ZATR9b25Xn9ZdCugj6pBSUZyIK3c26sh13IbGGZzbCPL8wZTngbtVj2pVbufkSVbVsAdBifIWuRGyMtsuzKk4BzZ/2wRdf+wTYzh+iJuyHRfsjkFzRIU0GfflBVDYF/Yx4qqz90XOT5mm09apucf7cqgGraBNC1UIea46g6NSItcqbQTzf1WG7gKTo5AEhIqK/s/ImAiJh6SA3Y1z3frpSyaoZnzSxwIbYhHsBtpIhG4yNfn6v33M7003pzKcuuAxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by PH0PR11MB4870.namprd11.prod.outlook.com (2603:10b6:510:34::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Mon, 3 Oct 2022 17:01:17 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:01:17 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:23 +0530 Message-ID: <20221003170024.195223-7-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0143.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:bf::7) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH0PR11MB4870:EE_ X-MS-Office365-Filtering-Correlation-Id: 758b7de1-a488-4109-a207-08daa560e334 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6M8Fjpjd/41qcYYSSFGo9yTMUEoyZ8J9iMdPdasOhQy9JtLtMvXD6ODRvPQW3EoV4H/jye6Xdlgl8PlFvy75XRyESwHE/0XjWpO305ZWg2FmU33/G3cl1Q4Mv4x0qDI48VulR4JG/HOlafWFtp9kYFJu8z7ilY1/McfIyQQXKFiQhLLmnaJ7Phxq564SMIp5aySO8IoBjJTbYLqJQC0aHmPIEIdjX8RN18JgjfL82I5nFnU48xfVcdP1+lQXJJPW1RyFc3TXdQey7CT71yJwxHAhH1XiLdlPmbOC6arN1KLbtSG8C2WlY4FvFeWWHSJRzT+LhYkfL7xz+cKEjGNxp+KgSGT0jlVAiY6lqqkIjTNPS2bOnQCzE/9DLYOiHlMbqInJgCloTIOv0BA6YDfNYDNtOaoZCucljyRL0ofvkKrh0vOl2NfOJCtO/ysUZGpdU39Sfh/tqbXvxAQc704g2SUuaA92kPo5Y25tD6JoZiHRKFRIDHDGeEBEH20njR1HnkdLYpHS0GxtQ/GDTI4mC+z6VTMvWgaf6hSR3iJvIZ+G+AInke2axtfrGhHRZvlLTHdxGH8oQNmtwS0yTquoTSwq0IZVYk9v3ptYVMU1Y27igXdckw2xMseO0nwnc9haw84or3QBdXigklzE2xCJD3XAY6ygrqhAmFbupM1xpFs2Dg/UNScEKTo6qMwpqdYOkVfPcx8SPtGEzFtxa4Nrkg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(136003)(39860400002)(376002)(366004)(451199015)(26005)(6916009)(6666004)(6512007)(6506007)(41300700001)(54906003)(86362001)(66476007)(66556008)(66946007)(4326008)(36756003)(316002)(8676002)(1076003)(186003)(2616005)(8936002)(82960400001)(6486002)(44832011)(5660300002)(2906002)(478600001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vSy9M3xuvDaR4/EHUzqlF4M/fr9rls7OebJO8heQyVJ9M4sLdSSK9fNFjQtVuzggZy72Dz1Na+U7aqm7AAX0ycnP0j+HctF60SsRQ5314aeT6MTnIhzaG5N/MnbWrqOrxRxDyhphQCRnA/5xb3diNNJTJ1GBkWnuYWKQwjGI0ageyojUbjE7WURnODKUM3TUMG3TsZJPcGME63Yx1yxrnNVcqS5TmFI67d5Q8OVSWuAICNACkNm95CCXIF8djdTxxX71L+6VH6cbkHy+X4mPYCjwHQ3aXWz+q7u9xFE/lXL59pAzF2rsRaYNu3R2IbXLsbwbfIe1TQGlzAHCoWGwc+y+2LUUt+gHZIV+4SwTYbwe3CTQJMbJeOCbAJdOlb4TRqCx2Fep/uwjQ8pDT4/9SstuOPxEsVWbaY+AHaprY8Af12YVgeuwQbG+Wog8efOXDxcJeLtcf7gZqswxE/ci1LnnV5vv2jxgjwkNn1tSHe7prpKFDoHs4GDt6qfKb4WzUg4RBRye7xiu5XZUCfNTb8YAfxcoFhIcwB4uHsQquAhorv58zQ75KRHIGy7QVmCyHwYMmLDd0/8AwiQYzzxd8uqeMKAFt/wQAcgZN6z7GyMB2PI6u6wMFnxDU/U58HOyS1wYtcdSPgVIRrb3ChBlAA1mIRzYH3Fd/dQRyDr6yLp5D9NChyRLZkYgaY70uMSMKeqDUrN0fkTzn86BVlyZbz7Q72C6kyt31PMz7y98JP2UXCHIgz+kw+QwAnMojtgGfZ3PdKBvmirPUcFD44xzy6f11tyUA5cysdvL+IQWmOS97Eau4r0Dj3rAscdhrxpTYOvpNAt0/tHKUwI2nZ0p9oH9JRYG8wIGg4ltDGBwOOvQuHIU/Jj1ELSTzwfC8Khc5ouaZLGcmcIbBsgZ1RKfyeB+VYbmgkUFU8hyMWrBgLfxFpyEeOpArtJ8dWAgiMgXGYDcdkd8TdByDSnAEqeVEKkmJJI0fkH8jY8k0xBuGo1rDT7OytKSr1O60fKj4ErWnJ4HWgvj1PfWP1nl2WsJddxOtLbCCCptI7GpxGSBgfueiHKvLi0s1U6+wIxCWME9NQ+cIViLUQBNNz3vpFY96E+fYiFd3o5+JKuDDo/AJdUIvyg8PBs0UBYROkjBds9TGRnYWYSSV8R9Pdcv0ONhMXK754+BGcnYzpRBaq2sR4nEkb4MRG6qVkrhIm9bS3byRg43MSKB7fRbq/nj86BRzohwtUXNW626MrLomMeCNfX8rjV3gLQoqqejn8G12IrY5tAzcSzHzNk1E9+ocpIHgnlbgtmXb7TKBzC1akAQev7gIl/itT1s8wD1T1kIyA2ym8o7zhIP/6Stq0uyDQgiXQn/ZPM/w5q1ECZNXBI9z4L/YOgTDazBO1Q50+30ahyaNmV0+UxtXpx/bEn8d4HWBJ/xfYDGAjM0SZxxWhL4XYaKAe5BDc+zDreUgtwCwJYJi/QxJPkIV/LUFyRejmCSeWNGY/WYmue5u//7Ip6LUSBiMA+Bmit2pG/nn3YnrPFOCHbV6ZdZcrlXmygs2aTJPa8whxvXh+n2O8eYM620pYz1ma4cQjZFMdbNMXyJShFm4d3uq5ZNBdrqJsYca7thls0BhUM9Sg6pUUfXv4ARhHo= X-MS-Exchange-CrossTenant-Network-Message-Id: 758b7de1-a488-4109-a207-08daa560e334 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:01:17.4917 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BESXX8yCpnFDAeG3IS77g+/e770H/yKBKmJcHfdBz8W3oviyTgQnLUtVI4L1mIPhZ8IkvTr/53RYqukY7Gn0X9wnyyxUA8Y/o0hX2/tVlS2kcKkWrB8u544XQCUYFLE0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4870 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 6/7] drm/i915/display: Fix port_identifier function 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" port_identifier function was broken when TypeC ports were using enum aliases. It would return wrong string for TypeC ports. With unique enums for DDI ports now, fix port_identifier to cover all ports. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/intel_display.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 62604cadf0b8..4a5f7df7492b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -250,6 +250,18 @@ static inline const char *port_identifier(enum port port) return "Port H"; case PORT_I: return "Port I"; + case PORT_TC1: + return "Port TC1"; + case PORT_TC2: + return "Port TC2"; + case PORT_TC3: + return "Port TC3"; + case PORT_TC4: + return "Port TC4"; + case PORT_TC5: + return "Port TC5"; + case PORT_TC6: + return "Port TC6"; default: return ""; } From patchwork Mon Oct 3 17:00:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramani Vivekanandan X-Patchwork-Id: 12997686 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 8CB43C433FE for ; Mon, 3 Oct 2022 17:01:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77B6A10E41B; Mon, 3 Oct 2022 17:01:56 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51C0610E43C for ; Mon, 3 Oct 2022 17:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664816511; x=1696352511; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=BAU0gC84rvBXkJYWMsECUTKbK8VQt8/4996dACIVH1k=; b=ZxXJnSRfkN3/XRbId2mbmhFyVrS7jzhHUToETNQwgELPtiLcLwpnEwSE pmtWvS/Ph6VWjiPJjBiziTFnmTnRc+3m3TxPLwDtS0da7Y5WIjZVukqhj n/BvyMnPmHif8yGHSEMt/YWq0BKuVbVVley8xO0Lalf9wB4pbWu6Jc0Pk lEqaXNJ2xvK34v6ruvWWe2KVM81t/EI2biOqaDlmb0216H+11QPWMPnDc 9vRtvwkY3mavi79pydQxACQ2D+sfnuqwObrc5Vlc/UK7Ylo/MONBGJmlt 8WokagSkGvOXPlEz5wFq3LcFELlq2emJfkhIO+HcebkJ/YCysrEHyrk8l w==; X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="283061613" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="283061613" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 10:01:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10489"; a="727844930" X-IronPort-AV: E=Sophos;i="5.93,366,1654585200"; d="scan'208";a="727844930" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga002.fm.intel.com with ESMTP; 03 Oct 2022 10:01:28 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:27 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 3 Oct 2022 10:01:27 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.47) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 3 Oct 2022 10:01:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mP04+88t8A0a1inPJhX9QXzQVadD/brdBr9sLfPqzAqBubc7M76k8VsciAAzW1svTfwciTQWKa+/bqX5SM6JOliqhv/w4MDqPxQ6ZmaZFmg5FEM7uJwfJPaVnJE19SFqGfVZN+ycdz7MwvJA48ayzTK3PEBYTS0VA/GRscL0ZMq6eVsqqs64AUPpGOQBa0bh7GegpTQ3USwgVc9ykixdzi/nblmvK8JLJBZtfWoXJY8g5Tj3sp/8tW/vBb/ieLvQpKtE4aTyPS5Ge6nG41G7V8ZhOKjkCyFI/frjk46jXjR1QEDpMMlWiTGCKxyrdyMBnsIP/wHsDlnQgtA2qTHj0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=thsGNY98TalJdJjyzlld9eBpipGT3bNbNJrRl6mwyXQ=; b=NWOaLVHqL0VvYof9k4PNjprww+0qgdIUxPa4TkgCeVjTadqW7P2/sgE+AP2pddyGZsozOQ0VJs84uo3mNjrK2eabGD8F4ZGA+7nBC/Ikh6bUeuVzH47kiYe/jvKamAJvJJmRuxU7L15E+P67zSNIuBd4oofSr2eBVRqGm5vAOdCYkeqnIx++B/wdL8V0zRENqyFsBNKqKazrUM99pITxaSft90n3cfYHWDoKSuvTFhJdOB/AZcOAtowevTKwK+UD81KVFSae9S+9peJMkzPZs1xd8SyCCvIhagGp8Ry6fdRooeZgbymcjxnTnL6uIc/aIoQOU2biTNSm/a3SictiUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) by PH0PR11MB4870.namprd11.prod.outlook.com (2603:10b6:510:34::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Mon, 3 Oct 2022 17:01:24 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5676.028; Mon, 3 Oct 2022 17:01:24 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 22:30:24 +0530 Message-ID: <20221003170024.195223-8-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> References: <20221003170024.195223-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0131.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:6::16) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH0PR11MB4870:EE_ X-MS-Office365-Filtering-Correlation-Id: 275a1f1a-1e0f-4c1a-07ec-08daa560e782 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CQri4FNqHd1LNDY4ZDArydu03zm3ZG89q9d/+OCnGE3qrF8KxSLi20Kwy2mPnKxbiM0SsHQMmi4lyOXlC0yYRIa7PbYeNhsnGQRB7ETMSMH44osIfxucPK2BvudcwNVT7KKdYURCFTmJ9NBiqd8njsfmbEb4oRXQLl3GFOc5gKAfKaXMvVjN8yzR9kQgqi8Xp0GCzU++6qKBXyypcQwD9Jyamotw4TNtlKz43tEXdj3RDMlyNvbY0Nmn5R7CFxwOpOlvr1oIi5LBX3102yvwJqUfL8R0LzoI1FGE7DBl8cOsbXmQdjwVrufzwhTR08ffRrDBSLSZnQTY1FODRo0IdGazRfoJP0NGDeIn24kMOTCOjpsbX/Ba8V3KNXE3h/BGBVh8LCeMymVb1PF8YjEl61vcAiawYPrkMdUU/dhGoIDeZJc0OeF1ZkCye0pTpt8rjofur1kUnn0LLp4mFfSQPMt6AxNxShn9IrSKR8dMyFqvqrfc2MiTDDDLU6JiX1GoMaATxNBmCgISKzfIAY2H1R9odmSanEPM5jnWXaMnwzJmKqiO2X05W5BY6zR315BIdur1/hQZnSdFfqIawKE5QMTnOQswQq6ApggnoO7Aij6v0GWOHSv+atFfRG5Q8NANjWZRPWMGUj7wNp0ysmSnxVfOF1d6ozMVKlBQTURRg/+bWWLTvyQ0pTmv19PgHj8xi6hMXc5Lx3rH44ayXJPufg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1897.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(136003)(39860400002)(376002)(366004)(451199015)(26005)(6916009)(6512007)(6506007)(41300700001)(54906003)(86362001)(66476007)(66556008)(66946007)(4326008)(83380400001)(36756003)(316002)(8676002)(1076003)(186003)(2616005)(8936002)(82960400001)(6486002)(44832011)(5660300002)(2906002)(478600001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xjR414FOoWrTqJFoKP43ICwrc452gcumRX6U4FTF32hMQzCRZX7XGX+qpQbOcX//kmJXep1v2zDiJqNL26zChZfdkCwtyV0eNfYt9K1VzSU5cZpjUW3iNj2HY39Qw/3tUxD2ngdqMtMDXGD+xybg/hMudZHAGmUf8S0ghJZvmFodbQ7J7uaNbs2jAUZ7Qzz2KNLDlwOkyPOjNF4dkfio+7oisdmy1yzpNIk46oc5Nl+g0wrU0qyGpxWp4O28w1i+7PJ9/0nSyFV/1P1bTPjin8Ln9FdTk/JB0i2c7eTob1sAFa/JofcBunxjkl9ZuRsBpd+E9qLDzsowm0BQXww/AifWJrN2xBaHhQ7XdVTK9asE71IcxVa+jKJPfsSeJ/8BVqdZVB8lA2HFfeheRkedtxLtjUWpH8ADgksfH52L0/u8POKUgM8xYlhroPGj6KdJi7360a6II/YXzGp/i9FilaZs0vjL4GkkHSEK1+pqE5Ver7s3l+a+JHiKDWVYPb6C6M0tyny4Pg63FLds79eZ3JHALCuWSQHXK0qYu6G3MyoE4OLVvV00X3UCIQONaGzJmXDeEBaWo3YE+bSnOchUi6j+NEta8l3/5EVaWgW16eLCq3VyPULVbNRHqjrwvmRnEUnldWEFQqmePifmWUAbSW3cXME8EqlgfseaKpx5VNHHFJxAY/60vruQ1q7XYVX9fvm/QE5heohf7AIiGsPwBSpA59AHUJDpBz0E2b4sDaQUjEHDCGSgCWgI7nRSLPYVdaxhQhBDkQwpmpWfdh9C/uvRiIqvD7g3LwHq+PpuJvapQRIVk9pd6sH/OSwAdA6RJ62yPZN6YzJ5spOj7Q1xM6esLaQnj7Js68EAOP1wTLzU90c6cYZLZEnvq0EikWREu6X/0NZUMscK0s12C48MUd74mVBlBfRYvI0o/NznfMSQv1V2np+hQ546+Vtbo2ziWXfQ8DHz7IiJFCImaMnuSX+NUCIOl8oRyZeaQfLlKIPe23rr63weSQbc4/xjICiKtefvImN0EvJ63Gwl+X2xXlkaRMc5CfVWYlCdMiYGcJ5szw6pqqcPsth6wCGebQuKFvw6OkCMyFxBxyMSYLskaV5gGBsoRcWGFgKx2McJejv0WCaqvsBWYjFNbxqiUHMQLENctMJIQMh0T7RBrw82olQ/xlWIcuFSQIQS0+vOllIKgtcB+xhLM2EpdUmjKLtVe72w8NBqR38VorYE+ejlhXL4uRz6cqVjhiGq4xoY8CkLJET4qc3j9QIFHOp/RauPQCO6AbgE7dnpOzXF6MNPNqlIzl1aoH3s7PeYbcIpML2YQJ62C+Inz6KUAkfqdCWtO8rzVz6FYkQBE6YVzOVB7uzO4JGVAFdw9n4VQ1kY8SxjNHhxfg9Fo31kTEhY19c4nz/+a51JLuSUNwW2u1cxOgeNjqW098t7Q80AHnOL/xXImI/A1xRUAL+weexpIYEMMaJOBIMlCc21BTKQeZKWSd7GRMgSYsMWnu/NZrBaFoLKnbDiC8bBUkEHz7+M/qtTjuJ9rOz4ECOJ5/O40Jq7rf9tJYuCJFt01x2JMJy1EWtgzj5mVxX09A6HPj+QwVZVDE1b1y35Ysg6Z4WhwJRd8rJ8msqPDUonROt6J1H8ZM8= X-MS-Exchange-CrossTenant-Network-Message-Id: 275a1f1a-1e0f-4c1a-07ec-08daa560e782 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 17:01:24.6785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HbmPFmxEc+7NtCNzj5N/O/CZwCdEIHVqwi3iZlLhB4ZDB/gvcQqFsdN7jEOsMf9wJKMMvhGWr5VfssVfCwBFkZqBmv8Oaw3BgodRgksXy6ss0+eLWGcBZM1f6O7EsoYY X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4870 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v5 7/7] drm/i915/display: cleanup unused DDI port enums 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" DDI port enums PORT_G/H/I were added in the commit - "6c8337dafaa9 drm/i915/tgl: Add additional ports for Tiger Lake" to identify new ports added in the platform. In the subsequent commits those ports were identified by new enums PORT_TC1/TC2/TC3.. to differentiate TypeC ports from non-TypeC. However, the enum definitions PORT_G/H/I and few usages of these enums were left as it is. These enums are unused as of today and can be removed. Signed-off-by: Balasubramani Vivekanandan --- drivers/gpu/drm/i915/display/intel_bios.c | 3 --- drivers/gpu/drm/i915/display/intel_display.h | 9 --------- include/drm/i915_component.h | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index ab472fa757d8..b0dfb37e402a 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2404,9 +2404,6 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915, [PORT_D] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 }, [PORT_E] = { DVO_PORT_HDMIE, DVO_PORT_DPE, DVO_PORT_CRT }, [PORT_F] = { DVO_PORT_HDMIF, DVO_PORT_DPF, -1 }, - [PORT_G] = { DVO_PORT_HDMIG, DVO_PORT_DPG, -1 }, - [PORT_H] = { DVO_PORT_HDMIH, DVO_PORT_DPH, -1 }, - [PORT_I] = { DVO_PORT_HDMII, DVO_PORT_DPI, -1 }, }; /* * RKL VBT uses PHY based mapping. Combo PHYs A,B,C,D diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 4a5f7df7492b..5a55b9f43ce3 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -208,9 +208,6 @@ enum port { PORT_D, PORT_E, PORT_F, - PORT_G, - PORT_H, - PORT_I, /* Non-TypeC ports must be defined above */ PORT_TC1, @@ -244,12 +241,6 @@ static inline const char *port_identifier(enum port port) return "Port E"; case PORT_F: return "Port F"; - case PORT_G: - return "Port G"; - case PORT_H: - return "Port H"; - case PORT_I: - return "Port I"; case PORT_TC1: return "Port TC1"; case PORT_TC2: diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index 4b31bab5533a..335822d6960a 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -35,7 +35,7 @@ enum i915_component_type { /* MAX_PORT is the number of port * It must be sync with I915_MAX_PORTS defined i915_drv.h */ -#define MAX_PORTS 15 +#define MAX_PORTS 12 /** * struct i915_audio_component - Used for direct communication between i915 and hda drivers