From patchwork Mon Oct 3 11:07:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997473 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 CA8A3C433FE for ; Mon, 3 Oct 2022 11:08:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F2BCA10E303; Mon, 3 Oct 2022 11:08:21 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D93610E303 for ; Mon, 3 Oct 2022 11:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795299; x=1696331299; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=pRHK5vO/PwOmhnsvMWUiYBRyxrfj8LiJrAN6K1wdhIU=; b=f7Tum+7nzzC7LZKZfP1ehXR/2Z1LOsxLBIEtC6n9qzHReh0kE7TXh9J7 JRhxBC14gaTu3K9Fcmt6HjyxiImbqRntetGjiJ1mjPzy9Vms324IkckbZ CrxohZQn3OS4C8z3MIltHgd/xeDrZNmy4jshIwctFnRtCIBCsFp59vdV1 N7QetEIxMBiXAIB6ZgQVnN+8CVYKCHr+Km8FvhlDqQHEL+J0DSDaqQziX 6f0tBpP76sk4dMwXQwWhtJQ64nCpqktufWzxTE/R2zIqUJdtO0CYi3AwE cTtfKwo+TD8OyMo9TxuWbSTvVcaPX46j31RrV9/6gEQdVXoqBzEZtrW5z g==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="300208912" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="300208912" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:08:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="727715955" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="727715955" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga002.fm.intel.com with ESMTP; 03 Oct 2022 04:08:19 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:18 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:18 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.104) by edgegateway.intel.com (192.55.55.71) 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 04:08:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gSxcH/yztDDgvRMoKLd37O0gkDj4Yh+twOVIuru5AhZN7dOwD9rVocMZCB6TqAvb9YATBkEhE8pz1i+KPTHdAAItBlb51oq8QmtL4wJP1AeV/5NmsZTCwkcHZy8gZgRX03ShXeda4qIMi8c7yZpv/oQv6T35cRafYak2m1mhT3SYp1T4JCPCGVjaJnwSUju/idLVnnw8ad3oomJdoi/ayLhogZ+XKBLfdf/+KF2vDehHH2+TaRHT3PtlnfuYSnhCzoHn84LNdpwVWmPFeRPS8kxunnzYCdHTccj7x5v5624N2rMmfvhurwW8jHbaMWGwHSZyRHO3sJox/1NJBK5y1Q== 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=gUA42YlaqqN+mmYmjQ3/a71WoEIlAjbL/cjOviin2vg26lJYSiQ5EYfScArbN4SiwQFy6vhsU1t2QI0WHpt54uIDkUFnrL4fzvSG8Um00lhJBML861DQty9ecig2+gBmIYuwRsIewuM7PcTwTWaS+HtdtJdLvLaODwIB7QI905uJJvqFYx1V/STeqxo00D/P4kf85dVK38R93IBmZ+8DHJubZwJTBV1Ze9J5DCAVgvYaJ7EjzxSiWa9xdJgY8X6dbg4YS5kw6M/2BFy0AXTcHKb76AalfKx5l4jNEGqxgFSWIEhvYOs7evAK9UZSt8d/XQGmMkEB/+QGkaWlBEWluA== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:08:16 +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 11:08:14 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:54 +0530 Message-ID: <20221003110759.140398-2-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0206.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:e9::17) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: a803dd74-c6be-426f-6402-08daa52f9149 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hn5akghwBKxsbE1NBMIwOnRou+vYnoP1DNHoeE0gOBdCC7EbYx7907RbhhHei1634ks1O1lAg5WWZJ+4UHLV/2oO3VF2oHpt3CQ85kcNeW5HKtOj7agviztQv+z5adD2CoKQ1cnrr3TpQwBxiuWso4uMZZ1DKtUDw8uTzJz4a3jHpgkeP+ImnGt24Ww8/l058Wlnn7LZSjvI8BeckYuzNs3+fuX8ihToWd0Ebzp5iv3mw/1KZspAxgWx8SqVjoU212blbzoPTnFavR6fXEa7asb5uct33D2KFXaSqI52TIDFrSWIY+WRXrM74EImXNDVBrfzDT1HK+1paBpzHjVFggkBUhcUtbOIG8RqvbYN3nUoeGsPDdtOkw/eERyxLOZbonpCf9X6iPu6HYt83DL5egaqkFLQTOtY5MogXEzP15oiik47QKnU+FiRSJ4kJELIzvs+myKV1H7lUKmZYhjwlMH/CGBz63UICsp1a3+wh/jEIVij6jyTQ2fEzxOdvuCjmgfkbtAD4Q9Gg2Ok/HQBqcufalFKhyoiB3AO2HWWCGrRsVl+NueEmgFwwsjTqaweBxQaFI4ZyNJrli/X0uIqdeS1fMkeeeA0QRZG+zjo7joilNRKyvy+UFlyCzDtVX8zbFU9JubOvilAGdtf3fxtuuBtePf6uT8pHXi6LCvNUDIgpn5Sdz4CazpeAHt40V6aWZBorST+jXtzGiTG2n0+dw== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(6666004)(8936002)(5660300002)(44832011)(6512007)(6506007)(30864003)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(83380400001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VAeV5eZ9onPfzhsjApCeptdR+y3wgOg6ImgFTumhx36ar+aVaGGAQEzKS6QiQJev4ISRS28iI95uJMs4XmrIgO89/DpDDHeI9Kpu8SsRuWhng/scCzEhBpJ6WJn1/sl69XVjj6zoZ0Wmf6cUJzq86LqAGITSwQj3xVSePfRFiOycN5SLUTXKGyTIganFJws+lAQihsCKypDFePbUh+LMdIubkv9l3LiSDkcc26QBKqH46Pdp5f68VVEQosHJz5P2X4kSubTc3LRwPqPT711N7Dy6KYVDNki8uubccBcp6YGtfnxYyU/gB/LjtiZqVpHVJuT+gQywhY1b5S3ptDU9H9l0vpGTc9w8aGyz5ZbL6id90i1rerDHSAO3LtUgzdMMl/Wb+lz5VS9y8b/iH2GBJfBNCbq/E6qbWSAWQfvyOQp6Bi6wC04MbwPd/9u1xMNnIcW15ao9fy5Se4eAtitxYiH+bc7hwY/YQ5gRp8oMAPL8d0TZbRfvZu6KYb+xN/nVLkyAGE9N2xRebjwo0spU9fdV9/rJu4M6ncSAqLwLhW6RbDsWcxORiWVneqUN+F9D0DmJzKRZlMrGfi35es9yhL/IfPfnftLajpFwrWg59P/rWF/AuXEhaLr7HJFIC0mIwdysGfX6Cgq3h0rCu4Xl0I+7L4Dk+89M5in3n49Vtj56xFsV7a8otcVqLjrKXrtc1goVNQFFzBGV70SQH/m+BJ9GJ31tDVlhiBVEPdQZy819LJ0gXGWMprgqTU1CWwhAFuDsWOV6mdLt4JStogC7/XqYVB7vZkE5IEof4UuOZ+5khbGshh8R/5InBIcgoAzq7Ol+7ZFxiHt3wZJxK/f2fEKzZTWc6nH6eBC6RDgdM3nk0siQ1xB+bZ5TN1O+/UEbSp3azDWi1G0qQTmutFlo3ZQrr4xB76mFvViCv/1xOnlxhUfLMU7tY4P56E4L82cntlrOTiS7h0AnoOm2kyZxziR3L0FA/EJ2m6URYI4gJ4M01CpNwhZnYJB5Em4Cc0cPuhlyGS0PNEo8YkzzWUGYKwbwJyftlbHYreBC1dyOq8wx7eRwpPPI4+wcvmq1ZurXzCi1RaPgBSKX6g1CLdMJAdD788dT18gNaxfBxzEkpJebKZHqEHkdls71JIkuHxQr65+hmr0/3fW34Y1iby4DfVjSYl5qAH39Il9Vx1/JPBNNRv5tD9ZTLlirNP+hrVlgfZk62umjdqUx46SnMDytnFFkQJjHiGT6woBmRv+YZUi+ShOwv9KZ5vhVmRzYOgglPcVojcTKCKCqqE2D5vB1liZTiI7bMyFOA1sQsiGRCU8MSMSGUKpowg2i7w9QP+fqSbvJMsU/wc7WAcf8jj66PY913d2yg1VqwiKPBgqebxlgEj7Y3u91fKrCVG49s2bncoJmw5KjNKTi4NvgarR6at1PCaOmwBsBRXbmC7Icpg/OQk+/T6bqKfVMwuAHp323XRY4uYpljt/1089fShz7iYZyIghlWZNJOFpYdntNvtW4rf9TbOgE8a7d1R6Rba10dCnDM0UrG3bF2htiKvd1ToFKKxVf/Mf6JRnqHhWDKQVPL1KAKh/l7A3s7iu0wbLK+JFx/zMOPVH60q/eBRFR/MtLf9sqrqfflVCz9871Ph0= X-MS-Exchange-CrossTenant-Network-Message-Id: a803dd74-c6be-426f-6402-08daa52f9149 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:08:14.9491 (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: DrD8v8RWMMtMl7Kw6sH2zN1BljBIFl3hI3gRSMDErkkVk80wREyCtIWoMARGzwYBFwKCjNPu6pzthUKULvnWE5cymB/k7+RtiH/Nu0uC99jD8wvxo8FFUnM5LQ0Tj2rC X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 1/6] 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 11:07:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997474 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 89A12C433F5 for ; Mon, 3 Oct 2022 11:08:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D13610E308; Mon, 3 Oct 2022 11:08:32 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FD1F10E308 for ; Mon, 3 Oct 2022 11:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795309; x=1696331309; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=XOLKi1vsOYJB4SZ7AM8VI/WTq6cjwbTYRiwjlV5xi/o=; b=hoW2YMRFcnMMoXB6puCsdXRXbe2kAaGPCZsHlfQcL5oZzuViEnnJBoTA Nq5FRG7j4HrA0idbe74Zb2V6b0FgF15DJkZo60qmRAHteZKC64NWCUsGl aAldWJhNp5zZuM8xHZYlw4HRc++d9tb6KhMPGJUl4ruu0NZuYKFwZKmOu I/mNnIrmzc+qp0AsToC1TD9qxVc5nwcifXa+rzhzBhs1j1hGE6eWNH9GB iW34Cpi9YZ/4YVGXe3e4onKZKCjE+JclMYXQ+qs2eOx+sR029cVR6dUmO U+ZMSHlyv3I/5Gh93NVYk5vGNVQgga3f+JfVwDEbQpSz274i2ARXiEJ5b Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="282976314" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="282976314" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:08:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="868548972" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="868548972" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga006.fm.intel.com with ESMTP; 03 Oct 2022 04:08:29 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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 04:08:28 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:28 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:28 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.109) by edgegateway.intel.com (192.55.55.71) 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 04:08:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XfNcg6vl5pKQACAvzDHy/3z1PH9pSpMLl/1FZNdKnJm/SGeY6hu58UbwO4VZ5b3OPohsOjnaxCn3V6uK26YQJGRCPbkYUSfYRwdMtuIhfdjOcw4iyCn++cqm/QpYP4b+KYmbrXbkZcFrpAEo0PyMZXb7KYZ+5HSxhoOnP6rS2X45Hk+5lQro2deH8fyjg1fcZLDmVT/XAf+AG9KGTxP6eMQZSccV3K728z/2eoY6J+0mcwKBccetMEDWy3T5QmJoKtpmXCvevEusLIE9BZrapWQ7ahcvRK1uTUBHKIFCOOKFHu2MFlUhHiNyMaEOLoggzex2cofkwrItFIr10cTZsw== 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=YTqE60rdTdFQumNKNt3tuWaFSxfdwC93tYqRIp9sZ8oJLUqWVATuyQzVQ3H7oWLZk2FAQsYQChXm86IpxkfV0hIDVzKPQ+EkVQwE6huCjXeFmvPUfyRTWkML8T7xTmGlhCD0tqOuOg62uEcXaicZjJm0i9GwNx7iAk89/CtRsv5tg8B5cZu7d7Cxd760v4BS1ksFn4QDuLXLLxOUJJglqLlqz8kt0BdzZyvRV0CXu+iGPCBI8Z35/c8obrR6ouaodj8VTAKTCvplizYhpxR5vYu8HxhtTbenwwj82Q5SVT7plbgLp3cOL98/98SB76UXSsB5c/NOs2EQnAEHjyKe9A== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:08:26 +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 11:08:26 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:55 +0530 Message-ID: <20221003110759.140398-3-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0055.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:22::30) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: 568a8eaa-6b31-4576-5f43-08daa52f9845 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dL2Qzq5Sa+gQ8tPFVcYNxqGwCHNe6J9dqjG8w+8U1K82/wW12eLGhrEsZJJH5fBgP72i46PLjknEDF4QQPPOhoVTSM89bKVBQ0NVa3rHcFAWl9I/Mwmut9nRrM3Vp3+UaUwMLLOanntiyKu3W+u+0G8TrztyBuglGkYlpV9olxazHY2UlTGkXKOaoudT1gX3BFLSX7QNsW4RK6S5QPsr0njUptMunWASe42a/DpqF9c1kSbvvncqOw3r9gZssCNSRWMoJa3SSPsFET3vbKSTg0UYBXkoDxTD/9I57ZPsRUXwo8XfS7t6Slfe3jPatYGRkkGmRZMFzaCxqC2zAzvzSZYcwbK5pyexxNbImGVCkA6MsRg47GEGvF/Kalx1sWcqAOBYAGKVkVFApIL6UP3r6yE9VpZClVV5q3Id4X49CBfAj0rg6gHrUI9esXCzL78649rQnbI+Pd7fhYOgs1Vsk5Zl7P4XsNN+aCwNnYYyeG/XOP08lderE+LQklSfBIdIWF1FqVhYqJmMhVo6R6toBIqNSsm8v0LX62hCCQaMj+Rhrv8y95W2mh/YMnctLIWBe6KMGHy1OKW70WhdMPoAbVmTIvTyObDAlKuNaBQyq3ZP1wWfQxf6skF5pYlRG0V7+AFmJMHer0LDy0QyLILLT04je4ISHgJV8j7V9ouIrZmNr77wsPPM+Shkm6Pbe/JsUmi/NH4uz0M7kZfKkQNV5g== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(6666004)(8936002)(5660300002)(44832011)(6512007)(6506007)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(83380400001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wm2t7UvNZW4/bzdaqy5PnEYLBvqWrettUGuc/HZBCWDbRbWl2C8J03XmHEUa5A6bIi0xiKgSCOw3S8bCjc1eYl2T0wlZyKQN1nqQ7ef6zKMEhtWbakz+W72bs+2brts/HbJJR2RAxANzxOfj2jyRyMAOYu2kHjXcI4OjsNVkH2gh7a9654PG4bm8NStrkz66CmR94mEJgx/uwtS6oSIYF25dIHknZrvq4L6AXj6pMk0L2mkWYSSZu6Z54w2pB5E8tK8vgWX49X2E5VFlbEuQWblgiXprh+W74XRX/KLSaXraITbZQNjsGsG02ZYIVpef1arr3ggqhOCJYhPtbAqC29y3zIiU1NhonEHb6Yya4yni2ta9bNmFvrKHGC9b+6gZUOlm4ZjHXEFyVpwAj9ftbor4ShrHNjqaGYCcogZ50w+pI6IafFZu5kq16k0wvBa5jkIxNMAw9WJfSaBPEJIbzbZ4Px63JF2UWZklFiTPPpH154RZar5WJY36bDPOG/RISuGNNu11HnT+AxkP6B8ixcWfVEQZIWAr4WqMtcf+x+X1HbjM/S21DwMDbCH8M5yiYBtLzt68dJau9rW+F98KegqOWtx17vNMymddNFXdrs1fmBniP3FThabG9kpG8AFkEhh9azyyLKZRSia7ddj7pxdeaCfH1w1meNDDKfWdy7k0/PvvEThOhQ49EZSaXwyaD2YDOgq/qMrpBuAZ0IxPoE7xiptXgVJkzLfxqNiaL8oJHbyb1y0NG4O5IlzQAmgZztMhWOzSHLm454y6Ky490EGHQ7rEWa3gq2IB9OmSrYwQvZaWyDb7XZlljz8njAaw+PHAZ/KlxVQFyzQzdhRtNtskRfNotPqNTGFKPjH4nV7bE3SBADBxNIhHWYmUTdwUyBwK6t11YF/6uYCFSiJJXIB67/7+JbFKMx1Z+/s0Bu0nS+4sb+RNIxn1g+813nC2326/T2xqdbbTsn2nalmW7Rm20rX+6C225F3cG+ghk6a89czU89qH2u0+EgLdCByAglCujXc7G/cFroDooIsFC0TYFegDcAPRMq0VOGB8/x8dO0dMqsKSBY48mVyiTmjSd9paofcHschvi38kKe2X/7MWkFzLpYhNcb8c8FoyPxFQ+D3psTNtbB7wjtwyeFGIWNVlhC0rUPsjLvWp/ez2bBu80VxsNVUhlFCbvlYofDIvVOQnr9DTgUwulh3SJozU6T3iPWyVajjUQbL9tt3XgHGWJBPp5xZYKi2ZsyFcrLM4csH/LGz/9TWEt+Ge0iN9mhw3Cdj4uoqPkmu3zBF2bqXH5oh4woBxJYwyW7Bl7uaeCT2HgUGZSjzrulkLBUIbIZjBLUytEaqTl7xkZZOOARqPqcj0aJ3RrWxBn8wAcOIrKmpB5Kj/MUDBk+igJJsVr8zH5Km8IQjkyxtcbodBDhLt4YzSYT7LEyoFapkfdrpSPM1p/smlZTNV8x0baFyn99EfocAE1l04jZMJ0ME/VvxfJbz/bzK7T2oD+safjePHwQ0Fw3nz2DmiRxrTnDi/qdhHz6aOtHv1ad5HWRBLJJq8G/yWvSXDsh6L19Ayg2Sr8AhtKvkDVr5HX4FKXJrGe8u/ijFhHhyzwQuLeWmbJmwp61q2egXmJ2TybgCQP/Y= X-MS-Exchange-CrossTenant-Network-Message-Id: 568a8eaa-6b31-4576-5f43-08daa52f9845 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:08:26.4950 (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: JBMnJUczNJ6GhWwB23ksWoQ36ZTWicSpw68YgPUsiwSTTeZnYms4BcgF/yv8m137yIC0Ul+2zP/FQwZLv4Clr3wQsL7hviBcf/YpRycmfCzcByzMJtdWOra5l0VRag3v X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 2/6] 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 11:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997475 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 33B0CC433F5 for ; Mon, 3 Oct 2022 11:08:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3124610E30A; Mon, 3 Oct 2022 11:08:48 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1C2010E30A for ; Mon, 3 Oct 2022 11:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795323; x=1696331323; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=dxERvTr0ZR8F/h+T9foUqxaY2PtSQQNGzzKf/R69MCs=; b=ACxQONgfjK/OrVnIENQiGtd6asyc8PohKKuqpfGwkjIRWZfRY8dix1Sk Xgq7rebmjL2x8MpZYgRfk0ZiWln/X2FmiyR9O3HMZJ/JoeTElC4WBhLW0 wa7f7WDhco95O7E5pp5GR8kufudDzhWrLE4VS/gz2WiyiH3aErVFH3mww Pnlhiq9wNsP/UJPGdhqqSnXc97Fk2KG1bl4y+SK7ef4BKjsDyoPzXx687 ovZCULRsa6kTUWhlNgBKFoNE22Y6dGNb+fUs1Ll1MrmP+Gs1PxYMvZBwf EGs+VAl06VpyFUqMySpAh98bd+WxxMntTOn2ROMiqO3ifoUpaxIhdpCIS A==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="289769902" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="289769902" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:08:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="727716136" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="727716136" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga002.fm.intel.com with ESMTP; 03 Oct 2022 04:08:42 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:42 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:41 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:08:41 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.46) 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 04:08:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SvxHY/Zf+6Na4l/+St1yh3JRintMGszDLOCRKqB86BuzVyJ4GbFoDnXuJcec1adz9CBJ/mOJNN4Km231fLEDJCtd5YKYlPOHuP6Mz7HTqWBPPGEKgfoFOjVLy+KBtfkVzPyaLA1v5XVu2VMWapPHGnsMPNA3CcvBN5MGhodkg9zUzbhywJXvNBgoptZ4L4lQo8oeHO7QGJE5ua2nmjjPSsdLf5bdfP+CH9tABwPW3xuPbtlWmIDarxLnYUYIHg3ein/wKUdOzOEYKnRwaJW+AH7Tkj9AO701rQEWbiykyZFTfj9oPXscSKJXVzde6MpJJaQ8fpKTNbSZgq04XHf6sg== 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=VDzMdNw/nbJG0pxLvdifysR2H3L457n4rdtnkZorO40=; b=Yfpic9EDtfKhy61FaU1BuKWKAVoan83vP5Q61D/AcQwYCC7Fd7ShMEZze6j3jwQZJNj41f6KFwSw7CnfLE+B74/pqlxB+d2uCYk8k5553a/686ZMBDidq/JC5Zu8KZCVCon6MXsGVR4KoaSLeEWWVvYCcHDTKg7CN61jfwQZwNux/PZA1A/QicQIKcyCvgXeUeHOtBBXwMSxaecHZbzfxSdHLtwI3X1IlGr0RbVOGQeo5M0abt5ZR4XPV6/dhYrODw4bbYSZZwSEx8AuKBMvUa/OmusSwZWGhqEGsIKfiSdZWTrj8dOvC5aqgbcggA3MiMK+lwNE/o/1wCOUwCEekg== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:08: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 11:08:40 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:56 +0530 Message-ID: <20221003110759.140398-4-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: BM1P287CA0023.INDP287.PROD.OUTLOOK.COM (2603:1096:b00:40::28) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: e13ab685-1b83-4bc8-0bfd-08daa52fa05d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aQjnSnmPCO+SjdZvCBtQYgcMLfCWtLSAULxT7Hwk5gkM6CaE8h/AQ5geSjH/MuXXRrNxbC1OUVEcRJ3C2LqZZfeY4p9tZfFNPVD2Yu7ttyI1yq97VVidrCxmD/AWj8kPJ48x+9xjOrgvH2FPDfcOku/JIN1vb03uEk8/q5Vw8zcKv2hQ/UdUfJCDkts3SMOW1jxAtI6bGl/NPbi14nPmlxbdcsTLCyLYtQriPrJoaNARicL1TPFyxUpYjUnyneBLtqsmvDYC8HZTVqPezuQcUQ7evGDNsS2Jk/NWrjeeMZqQJmSn1hYMqQqtko433gobYHH0446GxZADrcsJE/m13KTAy7A9iROp8I3QL7tq04fHV6rNkWCMvOb4Uxyfw/je2xFyHYDC/oyCj8N+4g/GSP7fJeRLlfKZCmnTkT2HaIvbwfMASLV/uZZEKo+seyjSAXoPx5TRQ2xVZ9IiCtRPe2AWfJ/Vd5++dcj9rrTzCgAlfGygvFw4n5lqDaxxUp1uhoO+vivzsHoqNYqSUcubOUFeAyCMj5l80OrGcgW3CMqb7VD6lSCZKzYpKUjWvkvGZoZkkBKVma2hRYZF/Hd58jCyjVb/Mo2WDeDhfR5zT5VWygL6Gg/BLTJLvxWSUzS1nFrwT09R3EAPetxZ25G6ptfr/BBBji5W++Zz6UtaTYH0xNqaUXjKv09kJfXOKx/+ZHfuxTQ0h6aT47/Eu9ZXyg== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(6666004)(8936002)(5660300002)(44832011)(6512007)(6506007)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(83380400001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w4+8anl8G2px5hozN/nnjCGE0WZdGCtrWOJ1/yMvg6/SgHO1gZvAM7Jf/f5s+7DjP49mxBlDostz1BaxvktQaI7AWN0mlDWEbEqZMi4JDEyWUbI6GMUC1WIUDpp8C4rywBBXAThXjdpIVkzDZC0Vwfqqyvh0dEMZznq2vIIqrgHKiHTnQvYZkEEeXZKvts17neb7Zyp87jRNmgDSeIxoV3Kf6VRkxN+oFD2IUlA3AOzJh5UyRzXCoY7cO4XYPVXE4piiE1apGPBiUYumEv7hE8v28KTBiVXuKLw3B9EXwZjyEBVDTpdRtVRMMQhHzz1+VQ0GobJ5o9XWV2dJmGTod8Lrx3iv0mUSs79C/DeCaA+40kwOVAGBTnJchm08HVOmTTEaxJNLvLruDVtw/w05IDwPImkEyMUd/TsObTLnFpGa1vWZPI+WhzhHW+0DuhIneHwmBIQn4g3ipfL4R2ljrye+5cv8whXPkdTIhhC7K7Y5HqNXjv7o0mgBVOeP82VRV3eLgixaec6Wqp77SMXuBwh7smGB/AMAFlw7gn7wZneMoEWGJYc42AVQHQk//bKKFsBMyzQTuepV9mPY/TJECTIT1xL3LQ4LxdeLw7E4OK50wcM79MCnjrqGNpIcLQdg98YB/8we9/js3uIPuN8O2CPbp/gWd8noZ/NHBiogj2Oae9oWKclrcv+4Ho7UWBSyoG0zalkoGiLcXBq2uvtNkdORmuzi2AojHo4xCZpeEmpqeHm4eN2JFVPwhVeYNYpF2oy2D2b7DXsqth/czHBRK+T4kxjeNgIuIY2akQajYy0B4tYQ65Z2x59m81ziWqP1XsgAvDn6hN0dh8CJUArY+AuYRTacvahVBzqzyei2GbS/A4Lhv9TFlHdXS9DUjc2l9bsjeSALR8J8OFTJZTp/GO0gjdiAHPzLfzw8o/qjw2/9nP+44XOH2m/AqcluWK+MIa54ElRDnsnJs5lsbnlD/VnqooabMhX4zZ026l+GfSEN+KZsVxNFXseQZaKkFWqFbKqHxR+E/sNx39muuuMQjGouv0IL2iLJzJLgsCs3tm7Xy9XjS5W9p1AnCpngvdWYTo1e5Z/ui6mUty1YWilfow9IkgHFeDY0sCbNpDDpv82wvTvgWBpoQ+wkENsauGPDAfITsm8wb09GZkeA1SuU4PtpNJEDU+vLzSo3TTHbLQY+tpIctpJBc+fjJ1S6A08QYLCa+xv3bbKtlS2OlDWJvmUcH8t1JhDNf97mY8tWTeC34qZhcCM9V5/0IP3cg+EVxmiFXk2k9nYuPPY4M4FXEdbwEOMhDnz7OZt3zwCuGM/+ljjh75HZDGRqBZkDz/HdbN2X2Ans1rVntmm26JDszS1FxuuGo0ZCilakfHrHShzvytIL2RUbmDpwm3v1HhWO7ymsEeU3ynaBI7EW76qyOYyhanKN0WFhO5itw+9NFxB382Gs5/5i3s+cpcEvBoSP8BWZ/uK4LsNN4dD6HSsXyoTGzd+ywdhU/DMBbTpy3mnDse6soiouRzqlK6YjjHGPnGYcyWDcWH5r7phpuCq/bxPhnZevMjB2tiTw/kfaiWLp3a7AmAXGG9wEGMcPPBM/ahq/lG2MwfoDx3iK+RBgcWGnW3HJh7BT6v7XvnM+jrs= X-MS-Exchange-CrossTenant-Network-Message-Id: e13ab685-1b83-4bc8-0bfd-08daa52fa05d X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:08:39.9938 (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: 53gaIOPxkqYzZi0s2g8H1rTZsV9ibcSfelXV8dHIhmoyW1jfiFsc9rRxTM5LlNOTsCqEGKXNuFQxYT14GYxGIbrbERFJV3Zu8/D6xuj+ZjsWkCAYD8gY/EVhSmaMgL5l X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 3/6] 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, DDI_BUF_CTL macro updated to make use of it. Any new macros to access the 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 | 6 ++---- include/drm/i915_component.h | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 77a986696c76..7dd6d108a26f 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4492,7 +4492,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 a91bbc6e1255..cae48786c5a3 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) 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 11:07:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997477 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 3B619C433F5 for ; Mon, 3 Oct 2022 11:09:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DBFF10E2FB; Mon, 3 Oct 2022 11:09:48 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9502910E2E7 for ; Mon, 3 Oct 2022 11:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795383; x=1696331383; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=mmahyaKvy8hAs8Fzi16KLFVrANGU0AYhjN2nLcjKZWQ=; b=LB3Mewss6vPk4ogg9XCHdZEH4CSw/hbdaG/5HU50orQJhUKnpAstjU/5 cjrdUZqD94cAhHnzIaDhAbYGA7TSk6xwY+pACv3MQSdtqjlRuJutA0eHk 91JOvffwIMfZsJNhxk5k9NsF8FJupAJDlTPH9iwIoJMAouzglndAzxDOs 663MuY277z3XzvryC5WdojmJSgpBU+y6VtdPvPffo4TIhYNWgU0+bvbm9 d9nLKSLHt4s2pw5CioEbiXFSlKDY2jaq3ORbKf4d/1upEcxc9RSjLy94A oMHdhexRpQ8LjwWiN/LxGqngiqsPnaNsHN3HoQIPrDP2GV9VFzhI2Asy5 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="302584491" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="302584491" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:09:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="868549244" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="868549244" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga006.fm.intel.com with ESMTP; 03 Oct 2022 04:09:42 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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 04:09:42 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:09:42 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) 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 04:09:42 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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 04:08:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dDNlbN3mFgM7yHk5FaKCV9p6ZC9RGH/pHhPXGYEKsa+xc/0DjSOqdwuSEasXJrFDrkEnlW3XlUTk+9eZhJU9Ul28C89oppKy1gJfLWBoGPRyxemR2kxXHxnerpp1Ijri0RdXWEXz0+SQ52MbfpwKDGLJ0VISHOCDGZwnfoZFiFioPQWoN7kLKROVLZn8UmkiQaYWtOhQQ8u/iWlvM8Ix8A1ZPJ3IGj5jlZ9cBqn1dA9OWptVizbilP7l0gnHL4OJr1dF4rlWjYWAoxFv3BELg6klZ8qjjHpI136Qdw1plc7Mhq5E9D92ZmtJPo9pJCH/SudfuPgoAeG4/QMbvnLthw== 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=dphufgokhtp3Kw+IpF/bj8kYkhJiQwFpnMSrTtkb5Hw=; b=JSGRSedrwhdWmBjke9A+4GittzYoC/Rw1+5IWqgo2NCJVSLD4vN2+qoBScOZOlbc2ASEjG5hOAsuaqhukcg+lAUMfEm0m4Afn0AQeQNOCVoRxdivGehXrscy56xy5w98Rt8wPZNoo85z/98SC/3oq9Q+76X1+2sB8h7/27G24obN7N6gOOQ9ftqMsgA3CHSt0KhIWhNf/y417u3Gqdyp7079DonKYfQeyBcM8NVm0lxybQjRSMEaCdeAoya7JN0Ly3w4S2Rf9vNVdG9Qg588c5W7Mb/t3bsN+9HlQpAKMeh5+uBpGsKQvzDUAK6C6YKVJONwX3KzKrM03DdF2JCVmw== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:08: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 11:08:47 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:57 +0530 Message-ID: <20221003110759.140398-5-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:bf::17) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: 721f4e0a-a375-49fb-acde-08daa52fa4a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tVxFADL+tiycLX4lFJsWVvhg8C1njRXS6a2Ik7PQGFDYJFTTv+XFbJ0fXkRa0XjDmJ9m3lRjsd0bTPxmpc9drI2ip5x6ggKXlwAOcSVe1aDPofdzEKHSlAP7gXZeKENSL1csGQrQq13ISWNYEU2b+g98BNinf8Xy07ZLfV8jhITUigDCLG32rVINRat3MLi0F3NlHZZFQXSmbOgRqhoFKh5wh8MR6Rsa2ahDZbfoQIG00ufN0AbB/GJJAqApXVjnF6SZ+9RnQx9WjJqUnDXEc4XUR8b/jS0OU2LwRQ7pme63Mcj0GLrNZ49Q8Y4ShKRmF0klS+MDF7zc3wawpIPHKxsiCunR7oyELfeqZTBR8oovBYm36OfdMzap+R1wF2J1mDKHD6YjWXKBJykR3ZirHMBp2/jIed6cdPW9k8d3+z7EpPcvmC0ACwPbYHoumisSIDQ5V0pICPo9nGSsRRgCniU93a7wJWq40HmhIaQ3wvCww1nFq213IekhSgGNwQCFBGD/LJvHMvkQ643vC97MBjW3F4uNyIhWvwly6qEDtp5Pvt+Y8Rb45yzhuQcqZJKzHhEgIHgVNlPoLHiaXLE+p3uiJIdHHNx/KlpptLMDAbYUJHUlcGQP1ppEjvVnlJd7tezcE7OtI5lTCblfVwgARWA8+RbZX0NljwWI/wImLqMlun66elUEXO2aQmwPrDgI3nXuO5z5H/e/sNYATcKyNw== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(6666004)(8936002)(5660300002)(44832011)(6512007)(6506007)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(83380400001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mTPhV/BMOqxPhS9MI/4JeiZ2dfks5h/Eom9exISJ8wh9oBg0krYOlmmB29U8QfDUvAK/kFxjdYc8ypPrvkbL47A9gzzhAu03JKDb8gdx4EsyEdl3erzQNMtWGw7tDq78r4cT4KyZJTuwuxS0rkxBnw348h2N9/Vl7VEl4FMFNPGzAnD1WPOsfyEGdjqrE4e1BnhxuyupwTewU380XSEtXf0WdPNsZ8XZI5l2F1hg8OJOCZAcdkdKp+MOyhU2n2eptXCXn76kvMG3gwC9HoXBdIi0/fbjmFMhthsOc93gD/Dyuui8xXOPV3p8FehOYAKeqjuU06HHg6sLFUz2MgClyFBqc+vWzVDONveEWrjCmtjtf6TYe6tZSZL+5jcB91uJBg+xthU1J8Gr8XvSJ+SGTTloB2zFq+yCaO8/tKp823i46gLRZLshSwOj6GLEWPpGCd8nwGfUQvC0o+8DNbl9D3LOF4w3aFQG4N5t08aX8FEpon1L9Cna0yqZAKhfnNxMZFlm0C7XAITI84f+uy/dGqHI/Au9J43Qx9ilALEDHSkC0snxrxSMLXwtW1jP4yYxbePbO+ovw7BeqL16urC9M3eECniMMYXy6qobwygmtie99fKAX+aHJQLLbgqyLRnt5gbStMdoH2zk50rqhr1Z0yjf9eFetxg4n2mk9Mn2Rbv4Xri1E+gpCqbxu4vZjbTf3z+SEpNLTLz6+1rUYSCRkQUO1WZxz1OmpixjKN5itnd9dnDur2d0fXX8xEwwrlmKNoT6bnRQDPvs1puoGk3NQINHUPCjjKrmHQXlk9wHkoJ4CHVCRwcgyrjLqn+zNkMO2a7hjpfaaKhZ4wbsoVCIYdBoh94gJhcWXCiTbLxbey7In0qS5p/ubucNu5uWINDD/F0JMkiV7EsS5v3ZOWu32KM1aGbv3xivmmSizmgWUEtJ+mBRJuogrGrS+Rt29dh966LNqwhVncEPhWiGyBibyntNu0Fc8qnuj3/y7Ty+QPaZ0e2MCV3iG0hmC6qHV8A+ysDvEhQnMU9Wi9wRIv7Bsbfve+VCiD39aECv0n6hF8uq5ts9xxEw5lzkVOeFAvgCXbSkjxk2tAQhuna3VzdXCTxnSIfGHDN+cQgVLMMxfAR+fro1AOpqcBolsoUCPeWXlKTnco0I/caU7+lakdHhmJK/3hnLHwk5nCvlucGd+MTp2qBr4onBmLKnR1pR9lzEfPfLhC+Rd0lshLzIx8KLyDgIrywnrlo9w/Wwa4YHEJSky+GSoZiD7ruqiIPpJfXW3cc+G+Wp/g7hpLefT1cAYf2dtCJheuTUpaVyjt5xizCCW+kVve1LuvN12Hy92wNES0GLWvY52ZWEFT1f7hhFesrBjs93KSSQKZlv05UOCc8mnBokW6AV1FaBD+DwG4JDtAHxQRoBKlLOpCtNNkPJ/EKL6Ez9JV5ofxBPonbPRG63fk4CP9lDkP16yC4b5myq3Q7qJGSg8Cm70rVo8q0f4MUBtyCN0M+LSd2guLkgHryqkTLZG1TxC0rLrMT2ZvQzlkXcZTdZTR6/XWoiJ1IO0PrsUMzDKekxmtWGUAccNhyyBXr3fFwTtuvKA4RU5RYMFPKPTAAW7knr5ilDSS1UXpvLwRLrgmj6B63m4l4TxM4= X-MS-Exchange-CrossTenant-Network-Message-Id: 721f4e0a-a375-49fb-acde-08daa52fa4a5 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:08:47.4619 (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: P4C28WDG4dooAwYWtxMCgAcpY9+WpUrmpEFFtv/IOQeXfaDXq8LV12OubyCun2y9QZIhCA8RmPPDI2T5K6t65CaNahUs91e86cU63awWYayf/M7I6aEzbD8YT6oby4Gh X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 4/6] 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 7dd6d108a26f..b95124c4fe74 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4133,17 +4133,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) { @@ -4312,13 +4301,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, @@ -4448,9 +4431,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 11:07:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997476 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 952FEC433FE for ; Mon, 3 Oct 2022 11:09:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA13F10E2E7; Mon, 3 Oct 2022 11:09:47 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4846F10E2E7 for ; Mon, 3 Oct 2022 11:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795384; x=1696331384; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=axpCy/cvmkX/nPyW7nDkGmLqafnYae9FB/kU22RDNvs=; b=EH/diPnfAzsSkvJTu918wtLFqeFVh8As6yZZQkiGeWnTnEYWXc/2IrAy 00ZL3n1Py5LEzbN61mUvxu+AvZJ0swMg+8tfI8UP2McxmG0OVJWcRq95B KCG7Uj98AQcPq5jAVfRMIgQR7vl9x2386Y4IpqNWQFYG3ABWs4q6Dw149 KAH9+b0mJ/5l4CbCtjU+vYqOgm394ZwMmqyQ8mcXCFX2N0DnNPqXcpKqR k2KH3LwwP8r3vPNLKk3U2zKmdQUWEsCGoz/PRZXol/rzeoF6vVWm1gUrW tmrLEdSZ2Oa5pmS+MqfMhgl5+KZCm+mzIbcmWPh2iZ1cCRiTyEesuwDE5 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="302584494" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="302584494" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:09:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="868549255" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="868549255" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga006.fm.intel.com with ESMTP; 03 Oct 2022 04:09:44 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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 04:09:43 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) 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; Mon, 3 Oct 2022 04:09:43 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx609.amr.corp.intel.com (10.18.126.89) 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 04:09:43 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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 04:09:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MdDeY5aLxzNRiM1JvkdgCR0aW3ytDM80gFY53CFt+ggIBDehMW5YZlABC9FbofAWIquyVr48FzWM5JMS3Sm/dCFVs0HH0I619E4UkErOr9EanyAHlw/Cn6EGhiU6qosS4zpZ2omrDOnguGgcFv1iW+VYwruJisPo4ypunkRLO9ZlK9coIMQRtms/tpU8akAGSsMOg6wjBvquUYLB3Yg7sBa+P+BfiscosGV931FZkuQnoBKwhQ26RD7r44213ZSTLGsYPoBFk/i4nmKKRh2wolr1pSAKeIsHMEv3AzBMoSHx/MtmTuw7X23+k0u/vNeCpxcgBfuI5hTbzKI6AtG2VQ== 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=Qd5EBG3tDX0iRGue395BWwRj51cJPiRs9cT/BDfEaUYo/zAT0m3VlPDsRJnQSxiG17wIdfNsms7RLRjt6PVim8p/mNodNrNySdZl7K+ou6vIHTrk4fGxU2arvhbj2QWFbg+atom0fjghobZPcIFS9a0kOiEEojcE3ox/tGmMKg+J09+eXKkVho+8QSmTsXss/3WwgJM3hChqJr2w9wvG154GxAsyRSJNrQtAo5qbmiEg1EHrFwsL3GHFMzRk3LUedfYFY+klZDpf6fM/psJjDNZPyz6OUylZCYLQAVGAaajJfXh7tyNKXg0xJovLAgVq45fCJvnIyP8odXXM81nPrw== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:08: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 11:08:55 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:58 +0530 Message-ID: <20221003110759.140398-6-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN2PR01CA0147.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:6::32) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: 106a3495-1e1d-40aa-1803-08daa52fa9c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lOK/d0drYoDG7Ik8XPRx17/HSoiNlwqc7y00WQfD5wpw9n7dci5V9HM+mFJiv7Z4r9y2d1O2klBoL7x7Uzpx311a1OgYaAfbfJlsy3tunwiG/X1thqcEZr4MSRRYRNoBrQnMAJliA8nKT4ed4iACg3C/qMbIyXBfbNIhK6I29tiHV3gnErBkx6zHQyBcqqtCTzA2bPkdtoHttfG3+bb6aq9IbUqaoLEuezbSG5ioPxe04Ehb6S5VW7eUpobbCxMBjxp8VNP4QNFiO1Lvj/wU4hpUYf1w9UvylehncP33c9FBrPJX9jQqM7ebbWwgx/cAN3bDgUDcMoCLmYAsIt9GkteONyHwblm8cSh51layRRzuTV0GnQEvKaoHuNBHrAYApj391dwrLcocdRT+UCmzHwtrb2FLEqDoMNAO/iqW40Azv89icwCLQDnlSU04rWckx+QFW5N36ojvKE5I/zeQEFKhW5R1ZMNmmuzVRfXfasOcr+Xm8UC13v4JxEqvybk+7oxWU7idoPlseIOx6UVqzk10W6dokUwAREV3hUKkeiDEO2KoEti2lnH9nqmhHjjzaW4T4iPz72LTqcOnJLIpSRikaYkZVR4fEkinUkZfvk8a78rpMwfXARMY8hnu3BkNfyxzzc/9J10YwvVMh4t48gA2vdfNfYXUfkuqdVY28YbeVXR7k0Tgib0RuHfzMl0O8y8vKM5l7Q+0wMx2qY7jkQ== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(8936002)(5660300002)(44832011)(6512007)(6506007)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AbF/C31vpiz0jKqrA9uJEHocJsVE0HGhw0gOQ24Hat5KZ5LdMbdELA2OJ5R0dUMMZF4dyuyx67zee2Kp12fdaaq6l0vZ26UDTEHxDwJ+GQ6TnveR4bCfYLCZBUYiypIaWCI3tdSBRDoqHMb0nQe3O20oVHMXBOhL0Y7T17gtQZrc0Mp5F358o+BNu+AlYrqMTacrHnfPGqTP2rxNyWrvBovp1q042zLV9OQNfeVZ4qWNknnP8F+LuScOdiB+JN4tUY//pZE2GmUveDldRgiNjKgsBhzp5r02cs+KckQAq2ZLoOiGM7PVXaaC5RV6lg+/VL3jYQdCDN3k2BamMi7CxIhZ1GqpQGdVQXGgFPJvoIlk8zr3b2jvPlr0PRFjkx3jR4XvtslJwWuC/w7VyzcPHPQxzpU+yyS/CwNzvoAUeCSXeijLG3f4oKu2xQg/nFI6w9PKPKcKrfUQNUbShkrLFp6azNnKlszl6ebYg9HdCDQb0qcPmMhaRe5NRkozdM0Y6RFd8iRMf6mtVoTlty5dlTkWxxWiLAMjQ370TvVoFZ5EN7tecgleqxW2tZ8UQ7UEwLDCJgLnVd3S55x7uQw59THjqPkiBxUOwtYRFnQu6HjF7sa6sXjMmsQi8dXIMz8lh2rDZk5w3AhuQmBmrxIJQcq2wtIy7RYMfjnXAjKlWBW0nhf1Hk0tDTcmNPO/swwUqJl8JA0UexVym0gjl5Y1h8EPxWfUKkKMzNsmQhLWTcVfMBBgJdk99//hZhLljE2iB9plRfiIzI2jlieuVxRJo+5I20Vsbpc83XzhTWPRzYo7mJ6ui3U7bWG4QHV+omlZ2r4cjavpieEuccIsGOStWDmucn5yzsZNMXOIvrId/1Zv2hf+MJQUNxvwp8hxqUvQsFp5D+VLEDtLCigN9pIo4TCNC+LsO2ICEgSsqIOCRsXg1Z1YhROS2UvZ5Y+UTk1VK1JPvcZglTIqLaGrlsF6STn6ofvTTG+09A0kUKTwB2FSn/On55wTcC30LT45D2t3IO84H3WWi949Oe6H6LYw/8myt54ADenJKs8DHN7h+Px8uhajjCaRJp5Ax94GWAshewCdaYrYvqKu6Qhdf9vYTUCkb9MCQdXGFBebCGXrQ9OwazRvKE6YKkibmfAnLjCOTmyxFowfNNnFpe4L7JkX9IM/l8Ape+M+1LG215SYJECFyEGI+nvA6Ei4gHxS+2r2F0ZEhdODh54FLNQg+RFGdm0xzewqrd7AFs64K8h/75T6lWW7/1qtWzk3kcBlJ6YsjJ3IC4Abn8MT6VbQGjPuB0W4Jmak953GYaUY7bhJVfvqqyLWyZK47PpjCDJ9hjKWS3mJ16443YfvvAp92SXSjH9nS5Ib672kJhoEVLpux351ewynZw1zenuBNQLXJSf+lBjP6d6w1GBRkpBfV9Q0vFSOQanY9AgNVygiL1jbZ1sunKJ0PlWRb3DTDkLzRe/sehbxTQOlvtyC64tyQcEAjvziGpPTPoGIqe/hHw3mDriFGPdqLLFIswbcEPYf8Oumi6eQ6M4176LhXCXnrBHUHgV78bvVTzRY6K+yUqwDJ5Q/3f68hoq3xZQ3CYW9kXB3wOfbnqrnJr9OqKEVi4MhOcJ6B55KOt/qARQYqYwo6qw= X-MS-Exchange-CrossTenant-Network-Message-Id: 106a3495-1e1d-40aa-1803-08daa52fa9c0 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:08:55.7737 (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: 9FkixgiDq0BT0+N+JG1rZnwRauriqpD+iFi7AIcw1LfVtHdwhP87P/T9/SWTlHCxNp0EoKbM+iSbZR9EQLs1z0HeOk42jKI/k0utQe0lM+FTcTAi+ie32o/fUJc2Pme/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 5/6] 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 11:07:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12997478 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 CE3E1C433FE for ; Mon, 3 Oct 2022 11:09:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B307510E308; Mon, 3 Oct 2022 11:09:53 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D5F410E2E7 for ; Mon, 3 Oct 2022 11:09:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664795385; x=1696331385; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=BAU0gC84rvBXkJYWMsECUTKbK8VQt8/4996dACIVH1k=; b=cUkISH+KpYYbzmKmaeehlyL+co+cGRB+wfSLhXZCAtMiuyDVvNhDV95M lORjjsmY5AeHXEJCboCXVH15ab+r79lnXj2+xvYPXZV1sT5LM+legkUND MWPximUj3ZWpJ+FUuzF1033Nm1mEf+/V6GdaPvlsxpDYsxOo2UXVItLuy gYBq3fjkah6dMonsFqx4ifg2kH3rmjz0z7L+XuVpnyd/cvi73chkfOGnx pO1oWzH4XorKQARFipQve2jDLfHMzDn59rZk09ffguUrelSQzXLcIaXyk +9eGCpyVIh/vfBP06IaYBgfjIocM+3JfWj7PZC+By5VoKg/I4yqetME2x A==; X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="388895746" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="388895746" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2022 04:09:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10488"; a="686070584" X-IronPort-AV: E=Sophos;i="5.93,365,1654585200"; d="scan'208";a="686070584" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga008.fm.intel.com with ESMTP; 03 Oct 2022 04:09:44 -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 04:09:44 -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 04:09:44 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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 04:09:43 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DJXbDc+KVoqlKmw0V6VaKrctUEA8NIN99xL/gr9ZAtFFK3AE1tAHu/Z/C8BljDb+Ui2aPzahitt3sxJryzXtYfOqo7uLxA9x6u5BbL1JCyz6U6tSwgTbcwDABylUnFip3YZ3LEn2abrI05MX4RIEeUWZMm8TbVrlrXFDpECGTE0wPjmTaXw4qtuMDjcXfAMDpwFOJCfZYUdXDAIXxhIkSQSlN7sCTlK7Wlc6XfIo6FAzeEk8yla5qml/7s8YiHNtcH5IpJyV+kbdOGinFGx4BPnYiBAVVeKVWl2Fj3ikcGpwpyvndvx1L7BO7H+bIqMQQE4nyq0n/SKphhPQT4Ewtg== 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=Co7dEq6s5/n1pxWtzajiGj24CITjEjkGyaK0FFrDPLPMHC3wPP6gI34ub8Wh5eQEdIJhZXQX0/cQ0KK5LSUXE0Srbonge6gaQOxhCLAGeJ1IV+HjIAjtuaisAOrs+p7P1ofuhOxDe54L/WfRbcPm0H3WfOd/9iU/GZLVyOcyizdL0Ch/D2dHhlVfjdiz3XGCe7/+vFJ+e9U1qVquqJW60gi4w7ZS9ztidYNkdb4iPlOIbve0nfJWV1Ay9RKLg9HgsRwnCj5h9eRp00+UsdW5HA8Lh3K/eiY9QhsAzLtYadfXyKGNCL+VoNJnjRHmeRAk3eDvlu3Ttb08ngyNFsw9Iw== 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 PH7PR11MB6476.namprd11.prod.outlook.com (2603:10b6:510:1f0::18) 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 11:09: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 11:09:02 +0000 From: Balasubramani Vivekanandan To: Date: Mon, 3 Oct 2022 16:37:59 +0530 Message-ID: <20221003110759.140398-7-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> References: <20221003110759.140398-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0048.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:98::23) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|PH7PR11MB6476:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d07900a-c948-4a0c-5d09-08daa52fada9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LYsGJrbLVd/3zBaKm0lwW8DhHgwmroBLk+IaXBnsLYcilhOduGkW5h/nOC5y4mxBuHw8MrAuT3COtmtttuZhT5YWo7Axdn2VbRtyMYhWOplVKxO4bmaRTE2VgBr2wc+2/2nqxRGZ97bX7EAhDPDGpSVLSniGRoC+QG0dIBvxaJzITObPztH7awKjOs3rmtC/RrBdi9sPFcz9pDaC50GXu5JpvdesG/NS5+eC1tWp9chLTO1eS7Sbt/jOa0UlmvVZKZD8neiIaNuQdFGVGaCZHZUda4Jyb8h23lHBbFeAyug5saAt0LNx/xaX5Bwe3iI6B91CzFyUJdT2UNLTIdLgjPuucsP8cANsnljGC7YIzWbIDGLlqbHfzf3H5TDGmZFqnKrmjDb0OoueMRm5GRf0jd8LhPWfU976BvkPKN8/MWU2vnJ/gqg3V7edCvQFcqbS1wWgnaV9xjxB6C5dKpZpLDIv1ckIUNrYpeFyzOL92F43t7bueSNoIIC40bgIFS/fH2jvraNWnlElSvRQew+R5zD7jcvwZFS9AyvkfEB9fmapQ961EFD6XBntJyJ5g6Xy5BYI8OcNjtbMoQIL0rIRquE/Ee6U3Xakje+Xm25iHHtfOQeLkxd2ogkmO1PDz9AOJq+BXu1AlJ/gY+5/zztCiqdWHO5L7rCcsXfJCBXbBccONNY2F6vGMmm1O4SO5RS3rV9oVmAT/gc4ZQdegQKuyA== 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)(396003)(366004)(136003)(346002)(376002)(39860400002)(451199015)(26005)(54906003)(36756003)(6666004)(8936002)(5660300002)(44832011)(6512007)(6506007)(478600001)(6486002)(2906002)(82960400001)(38100700002)(2616005)(1076003)(186003)(86362001)(83380400001)(4326008)(316002)(8676002)(66946007)(66476007)(66556008)(41300700001)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eIhaF8RmAK7kNb906dEuPyudKejMOMWin1XF194r8lfDoKI0NQ+3BOMC22S9ffAU8nLeC4R8FCKeIlT5veEBqzdsFFirbRTpmSudXgkPxmt9d/9DMxx9s+pv3dFbS7Bmru+VudHX42XwsuABMaKtR37OCiSE/4nRYOFTCTS75FnZZ7ICz2D+nLxyX8M4+Gqss7s8lK+WPnSIcYFJyMGhcbQgBvI15RgiFNBECR1ZarajrOfXjbO3ghHrLtDwPBQQKiP5P0DuJxt5oJpGmBRc83PYYtIhVdcbhw/7B28doRf0DOE9Fx+G7sKXYLnQ2md8JswepnYnokZtmS3altxJXShtj+9L7yQWWOST/hjie4KPy3BVHrpuX4amtZ9OkomMi4JcybMTUuLJlVCBtloxmx/6jhQqoII52Cd1XbI6adVDMm/DyPkdp9RoBuhMNYJYsPp2E4w0gatB5Mc5Vi63/LWKG8v/EJtK8pWPa8siUzkA2bi52kpw9qeHHPTEwpZj5uU2KsGpCv5JRh7KMA26K3E4D7+OBWhj3ELMh3ZXSJjgq7xVv4YzeK/1SL2u6QUCsYCgGEPl7ygM7O4hiEJvYW6Vaz3oSFmN1igqWvDXW1XXuGOdemWzeGj/bzZN8N6rt90DulIJaF1I+GHMu/wm6sM26ahLe4PTqjV/A3yIj6eKsryMo6oaCMecYoczc2L4uWcWtsplWQwZfUZ99S1Lo7SDe96nUW2lF0uN7U/U2bVYUpNGuUSaz5adfEyZRAKWrL/VX+HNN6FMi2a50xLZRxVlcNVWRjdDcyen2qYK6eDrt1NEI6YPQOCOxD1kUKeNTYVo9jdNzt66JBuf/ZiR27HjQu0DpEvnsuOJOM+XefWJdiOl1iggnTCTS1Sn7LhcuTFT9kz1u5+yqVggA5A7NsBIUVFvD8b4/GDsSj2RM49b/xyaukGK0g8Ix/kOyZpR+nkyo3/5kxAa2GybTwrEe6+RU9L3hNygbs5qW8Qx56DbhIxaLqSwBI8F63pPUF0Ori1dWplSuK1hBHP0Me/6QcPNxhQBcYKqV7+WyAI4W097QH3SlxZsj0UzUFptPNsXXT3oVCnOpMwRhR32BuuojngjcP3B3R8r+VqWB/toC6ak0gbewRFcO84NCTiAoya11d1sqVnelfToaozgWml4ny3CWUZkf6pm8/yPbZsDIQ30glilOHVM7RYeYYld/c8YGfug0M5Vsb5b++H+FoxX6DqpoH/V4LIB7jM8Ek515E/W6fxO3zP7KUtoFbJQO4UUcwQAIGJYSLEtuSjIb+YPuWgV80sIn9WFHD6A3gcfHq2qZbpI9P3o/NZy1TRQVq8BMi1AdhWzntDO6Ud0aAcv0r8ViQ4IZUanyFFLQxpf6Tb0rp5Q5qV49bTf+tFOSnZnSXYCuJ/pl/O6Zf3xNNtQROUb6O8Ko1Pffm65OcBMrSK50eITnV1DFaC/lqDyvq5KHPyNjFJn0O1pSk6O9NBLFMCjR9+zNQotbM/WrjiIKpwWVEthpaz4IiKDkkQPXi70W4Ln3P5jGJmYDBmUwbKABP2PuYlbyMSjUAFEZ9pvc+VpWunAqGe0syscFw1FiquaRWySYcLsG0js9KN1dxJ3YExJmf+YCQSIUNSrLJ8MD1Q= X-MS-Exchange-CrossTenant-Network-Message-Id: 9d07900a-c948-4a0c-5d09-08daa52fada9 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2022 11:09:02.3043 (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: y9cbUyEuwPGA/Ae/ScEgb0IJT4uFzWVPMZFqDjNGqILud9uuczkocLMu0kvSgbrrmuInoj4Hmu0MMfTQ9ZNg26A+BkDZ8an3tqw4LSVdFDFHhuWWqZklrApVoJ2CyYwZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6476 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v4 6/6] 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