From patchwork Tue Sep 27 11:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990451 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 63678C54EE9 for ; Tue, 27 Sep 2022 11:26:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8587410E8EE; Tue, 27 Sep 2022 11:26:27 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 72E9910E285 for ; Tue, 27 Sep 2022 11:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664277976; x=1695813976; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=p0C9ktX4QSonS3TNSrGj0Zh4aH/sYy+vWvn2R/KLqi0=; b=Oc63SjYxcIaUJw2HjNKnYOJkrx2c+FxRnCgM14eCafgmeD1fZ4vR3Xj1 rQ77XTguuGkwAEv0MQEt7xV4uKQgcXc3q+SjeAv+IWjQxWZiy2nQg3DHd +ly9+MX/hyJI1a2tlO/Ut6oQTkz6WVrpBx+tHubbaBqAa/1DxFihl45iD xqG0eHLm+5DtWv5z7+7GIyV1xJCOJVqcXjbMRJTLERGKeEcx3+cbWjozs 11U5gagg0hvh4I4gEw0MbYQ6B4PmDt6RJWqdvYG3/CHBJ4dRmR9A7ly+M 4Jw+AulUOA979k8r/rqWaqLs4j7ZOdXVK320Tl5uzUGKKhew79TqU43Ob Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="298887909" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="298887909" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="599146556" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="599146556" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga006.jf.intel.com with ESMTP; 27 Sep 2022 04:26:06 -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; Tue, 27 Sep 2022 04:26:06 -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; Tue, 27 Sep 2022 04:26:05 -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; Tue, 27 Sep 2022 04:26:05 -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; Tue, 27 Sep 2022 04:26:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a8PZf75+V3Ddd/CoApkzXHveLJXFtKKZEtGNl/Gk1vQnPswPca1WYaeEkLePhumjq143Cyhm0lyV1KhZHmFUF1y0B3QYNheQa7Lepbm1mkq/e7fyE0qM8XLGN7DUJNgxSiszxdoLhgVmh8naLQrT+puMfKR1bRmK4n+F+I8HmlTCCjCS5/xtxw+e96wgmUu+t6qBcBnln7ZFBou7vVQOgx7Na3N+icEUREodMLSXy5xE4IOo0GLn0BSiZ/exxqS4l+gebfS5fiWb4hvqwdk15roJxivhE8JsCGPLs15A/pxhoIUFzlelBFv2dM2NibjFwDXYKRc3shj+9954c8cbag== 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=1mlSssyNYSkG9vGBbBUnTVdOuoMzGMnP6bdrqzKkggU=; b=F7JcGRUUa8KerucjthxiQCbGclJJrqwLvw6jdDnxyfd2ptxGRffDdSqfd/XwSHmyAJ0XJnBKoklY5eUtZ3xT5l2W0jepUy0w30ZeZ1Rogekk4d+IDQVpnQUUFfxqHa4xvcx/zHclyQ4ktCoZ1rF25LULqorZz1abNSqTYn4YCvaWukPMKmWOLKdCrq4gK02bmL44B8HkzmEIiN5pPI9LoLDuY5pGs2bg/c9ZHfNOJ4LM7jzboAH31UYzXL+CcfcpK3oakfx41HZmcEczqz7Xg/q1NXV2yADlu6PDXfSlFZG6+WpIk6zZXz94ONRBsmFmRlg962lhmW4QfGZAVbc3pA== 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 BL1PR11MB5333.namprd11.prod.outlook.com (2603:10b6:208:309::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26; Tue, 27 Sep 2022 11:26:03 +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.5654.026; Tue, 27 Sep 2022 11:26:03 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:42 +0530 Message-ID: <20220927112547.328078-2-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0078.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:9a::13) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|BL1PR11MB5333:EE_ X-MS-Office365-Filtering-Correlation-Id: 251327a9-406e-48e2-5bea-08daa07b0f5a X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A+0vYlmZR+/EVM9d+uzF8n8DEENtcZfFqjiWOMhrwAtlscpnQzP/8ydKovF4iYfVhwk1eElalgHnkaVfbhwHuOH33GbOGoFofx2rqrTrCHbR3ZKKAlN+6o5WGxdNDQOGbQKJp2dR+AsO4v7RIaMCmuioH0SFgY8+gT/Ioi4ASc/xeU8QCAb4iJ45gq4Ay0MoGFrcctx8/3hClo+44MI8mIws7+wIUoCc5AdyyMSQfhvRHWUF0yIrpNtm2Z1Ckgb9NPISmNwTQhEuypxgnayT6Rf4BswyUVxj4m/5MAQFWYNcX8eL+S0dyAmAa48JHYotXx7cKkVDyXDbtZyYV8LtVFHK5UQIHOldAQgaw6kM7emG0nRlMrEKBmHxSbze8wy+i4LdSgQg35dP+C6VUBFJoJTIIh1weOkRWOnGgpVXUXloDgvRIfvl+Ebw1N8XKqQifJM2uvwOHcxnh8viR3YbB666vdISmQU8KRGyCV+kUgP9ODxSmV4459HwYjJ3DVzuXKKTRkIZjL/i2dibULZy36eKI/vBW6+83GA9cPn0UFFLioTywNsegQ8JGEf3Wp4ADA7+xaymWMrzd1eXaV8F7XIsPGrpGtN/YoES1BUtbcb0RfK2qZKg+qmV/LvsSgtVMVxHCW61+mXivcuATiB9tVv9p4JT1yuIL5ZD4yYTQGBdJbaoAtH71EtUYilYwheTmmTYxQOa0rqlorU3tMug3A== 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)(376002)(396003)(136003)(39860400002)(366004)(346002)(451199015)(86362001)(8676002)(66476007)(66556008)(38100700002)(82960400001)(8936002)(478600001)(6506007)(66946007)(6486002)(41300700001)(36756003)(44832011)(30864003)(316002)(6916009)(83380400001)(54906003)(26005)(6512007)(5660300002)(186003)(1076003)(2906002)(6666004)(4326008)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +QQ1FbL2qdw7fGnVDT8R+WYkEL9U2I49Z8mB6SUxtZsn8bAYY9U7YO11Ci5x/u4/cxyN+Z1qFTF0D0KT40z2NuY/4InzkwYx6ehn8DUKDdH1gUECE9KwHhQ4m6k9BIYKusPw5e5q3E748TwxMva2TqlyAvycG6NKvLgXKRFPIcovYlyKe16t/aQsr6W+TLaYhQUXafLgUPgR8nO8k57uzcqOxkh8SvdmnUV/7xt7E/Pt+BGCcX/T8HrcAiqOjBRk0AaAVhzfn7O10xbyeZI9vcXTWGrMOBHqoSiLn57TczdVJYiLhhHLvm5cdU9/7UOF+uKwNoyUJLd8eFXu4qP77rVQWSmSIXpJEfzTJfYgFKLQ0LTcMCczS9x6Pg9HdGSrq05CbFk5eLRgkn0ar3TkP/RfzCsZfDJ9Ts/rBV8D62zdPlcNlHHYnzoCE6r20AebcO6tpNVqs7mrrYIwhqLCSVvQuppHklIg1RrN1KKYyQdp6XJ3vfj5q7lbu/6l9VR41bhyIm72cUVbMMY5ElzwHZbM10Pzu2xFhENVal6q7PxXscUTFZCUpz2y8Plp1TDOSk2K1olGp8z5DD/4rcpu6SLZjFhnvgFWu/i1Pj8IIja3rWGtyKBcviI9CK6RJUfVBvNKVx547zI5WY/JRQjSmyysKGU94kNOUph+YjoH7DEZPk3VuJ47bAnTGmmlTOkjs1pRzkJQ+XxpCEU/TwsIZMN47LKyP06TgPjNZS04AtJiiM2CJ6LX8llDVYnnCekQ72DHy+Q+OWGm3lwLvHd2MwmyXKx1+hac1LkDwsNJhS8iDHv+FVBwtRxWPWo0o/GY1HR2ODG4ADE/229INe1TXbErOCVWJAFQT+hM5X0gUQs1w5VUFhEHk+d5QEkpYw1QUWY4b1KnJWssxEvnqcvh4dN+XWX+HW5/RanJy+G9g0le1cpjkIUK1Pd6ov2ROJ8z8AMoWo4I7nX8N8Qdl2hifP1yIT1uHzSmD22esjJ8xY7zUvMVQteAfyiXQiGc0j0eUJmtMhqWa0rt38HkiiY8Wp01bk2rRLmzWCe9vxdZPUdzK35HFVUCuL1WbrvsVTGybmoOl3lHEdXOiiHKI0wfPLa9nUzuNsgLehholCM3z167+tMoXA57Srq/SXRbRAkjWf8mTcwz3x4DHYsIDZgqRyLB1WnpkskbnrH0eENw0gJAyUt15VYbXc5bfGnWl5bhiwpMJN95apDF+vvR7hqyGODcNQPvKd7ZW4creI8cymhg9gUivMtQdzGL0lpi4COMGNl2i6zjVacl9cC0AIplau0OhZ+yMQGlX24/i1F2dCKxXvpGSerovpu2nJZPV/PqrDQZ5nbbuwv0o6r6qN43SieEx9BapOj4Tauy3Z2R83K9M5TBuuRp1E4F2YDL+agR6reCuyxse+EFkAs0paMzQLa3eo6xQh3u3nWk8QhE/hpRY6aaDYZBcDI3gpvQth6j1HsMxY7dkESn0Vqc11bYLVVoRN2LACvknoGb+fZIt3Ms51B3yO49ade1SMwljT16pU5T/1NbdXF5wj3mXy8d6eGm+4JihPAOYb/YpHDeJD+FmWzjkycFGUaFoCLe9+lKPVfNAtrpv84RbMmve92o2D7ATQuao7kRhqFBYqz/PJg= X-MS-Exchange-CrossTenant-Network-Message-Id: 251327a9-406e-48e2-5bea-08daa07b0f5a X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:02.8941 (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: Fg23Vucje7QhluDxP+eeOLzlSH7BzIMzayQ2TxB4h3ydcfG1njDpEQW+eE7cIF01O0wjSGdGgn9JxXkufMGpPoSSWvA9Kpb/W6Y1wc5Jp9gHnSsXn/7KHhBhAQH0/NU/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5333 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 ed4d93942dbd..70098b67149b 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 643832d55c28..aae429bd2e2b 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); } @@ -3805,13 +3805,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; @@ -4043,12 +4045,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; @@ -4084,7 +4087,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 */ @@ -4446,11 +4449,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 dd008ba8afe3..194a4758ee04 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7880,7 +7880,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) @@ -7966,7 +7966,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 e5af955b5600..8baee1f19d89 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 5003a5ffbc6a..67f3b17b2360 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 Tue Sep 27 11:25:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990452 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 450D7C54EE9 for ; Tue, 27 Sep 2022 11:26:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AC7A10E285; Tue, 27 Sep 2022 11:26:41 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DB0F10E285 for ; Tue, 27 Sep 2022 11:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664277975; x=1695813975; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=l5lGh0RK0tD8sPiXbVZKp7Z81YdM1Qb7shN+UTzTDpQ=; b=U2xynAOtwcZY9V1bmkDCXqI6gNupzPbkdkAc23nvzAbq5xiUGPoyYSHP VI8zTzT8/6VOlYnS2fVGNddVPcrrKCIPpmSHO7NBtqEPRAb7NU/xhFVBO GZLoyvaXn2bygaJ3b9LTwKQ9Pwm1UdzXHm6TjOkZGZS/zDRhLyV0GHGqc DaRAHtBc5UcMrmNWkjTbvakWagQ5gOXwwHJ176tHLAIYsCRQDUvQWfuzP YoEAoWPh+VMcLPUUvpQBPmeWL9cb+CNhgoAPn2fW+zRq/biEQoeM36lj7 ZqHsOgHF5P5EAP+rJ8duwTS2+WBqfAYWV8dpsmkdhNDTAbOSQN3hThp4a A==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="288441274" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="288441274" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="689959570" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="689959570" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga004.fm.intel.com with ESMTP; 27 Sep 2022 04:26:14 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:13 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:13 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Tue, 27 Sep 2022 04:26:13 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bv/QpwPliXATeOQXTGT8BU2VgKjAdKDRWrdLIfIWvFPCi2c5OnqRQ8Turu8ExjPWsAKKaT0vyc65Akb/viNqN6/Bjb9BrYvFnRkJZbclYLJD14N85z0M4XfnbAI+Z1Xzg9EldL/4lxGzX/6lTK1zQ3cl3fpdkHRHKbNIbYav4Q4cH3ZO4Wc03bNNZa7xlshKST/evMDSWZYpV6HjrOK30L4cYwX45M5pK2y9q6we2DDSBnA1pQ+W5cH3eP50OHoXdbV+JGiEHf5ofNZsafu3L24x5b5mZwAX2au5xhBTHmpaLowiM772WuxTGtLRIz4iUFtvjiDT73s8TlZeNki3FA== 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=3/OaMVIZj+JvFxkP7J68o5FXfVFuJN7I4uL/Kf5FN5U=; b=OEkf6NIPZzb5qOESuao9WiPbchxKDiDj5i4bfTy3/5Bu8CM2WUCDLZDa90R9zsrBW1s8BJmvbKukxOseBIcMB7tEfzu9gp6mD5aCiVr2lNntM67/VhTU3IJl7GU5cAmFaRUVWCl0rdH6ojackR9ll/+5YwJbCFzVb9M4KhkqBgK1ynqYMnLtChaZN4DoR1D0eMkEH5/VAELWkJqiPV51g9wiYC4gE7JCsFPJ30oTgsMHWD2fPOoUfpgn91SHRJnD+ziLxZbQhM3bJGKhgT59tjejuhxTCiZG4gCyzFJ+tsc0yi1DN245hVk6LcqazNYkDWnK9juThtorbCt5pL8h+g== 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 SN7PR11MB6797.namprd11.prod.outlook.com (2603:10b6:806:263::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 11:26:11 +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.5654.026; Tue, 27 Sep 2022 11:26:11 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:43 +0530 Message-ID: <20220927112547.328078-3-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0187.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:be::10) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|SN7PR11MB6797:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d152a80-ca3d-4318-7d86-08daa07b1447 X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JkM4HFm7DNnKQNML3ASQqwXc4UvGVZ9ESxz3DnhtLZZt+h2QI3nudJ5ckJiCxzMHflBWRoPo6+Rm9GF7aAagV/c/GPxFYb7l2/gfasExy8H/qVpjaPdAPqdqKV3FPh+BUvJ47kt15R2+ugL3gABtvYlgfgsJf8US0DOL1bp6dYWD5aDb+TqaDhElxnUEbBotDhOvdrmlOLB6kmHzMHu2w4a/fqK4Mjv3S4swNeCDqlzN1xjRy7yH3U1TK1697LD7WRjmYybf5oJOU+SdlL+CN90u2yummpSRxIIiu45TY64dTmDhWwF5+Bb5Hbu7kwbup5UeYTDhLhjCFeTFfFLGn+aYrvd1RtbgxsJJsJ3xyTEnnEdres5eKqCVAg+uUx4Cw5UO1IAzF4s34kC1KUT+nIrrbKeDZdyI64V/YEQUrEDlF7b1bH33wXJPutk2MXdQdeqR99AGSErclxJ2k+MP5ZGKHalCtUvUstxaiuOcKcDFQeyDimCQl+utaV66DKggfljbDSBZrjJmvTmtSJTHDLCRcWJuz2VK4s00P6bxxK+df3PtEqGeg0LU8QYW9wg6BprGzl3lcaIQ1ncDBuS/GniZ8mdibNtA9HlYBj26ONH0p2DPnKP67ngCj+g3pUZJJsAlasDRqiilJ3BlNs9Prf9q2BMuvqFNe5v2SDKzM1zuxWFVYmOJFV3JfQHuERCEZWbe1jtedTLMqCMkXih8PA== 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)(136003)(376002)(39860400002)(366004)(396003)(346002)(451199015)(41300700001)(2906002)(44832011)(36756003)(5660300002)(8936002)(66476007)(38100700002)(4326008)(66946007)(54906003)(8676002)(478600001)(316002)(66556008)(6486002)(6916009)(6666004)(86362001)(2616005)(1076003)(186003)(82960400001)(6506007)(83380400001)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XTBDz3dXmIfAA5m8Yoj5CZRnqhfUM9/cxWA/V72H3G1KpwVYvpa5HbTMNZ4IJ7Nb/0emf6/9pAo5165xOcPPMgmF9cVT1gz3Itd6bRwJ6XaOr5Bm2rd1GMutv2pHZkpTlXKQc9STB9lhZIm/YQx3Cdr7HPSsfl9oqXtYeyCnl7/p27RVjMQ4nvDp0y52VApg2hDYOFeddy/xkfiFdj9kf89FCjTUhEJd/w8EYCGy9Jb/7OUvNVs5/JVy/XFJUts7Af8Vt1tIZBezuuT9BckBp6jiojj4tuTvuetUAX7JBVtKEWxuB3SpYIu8gqL+ep1XySKNVyTQvJ0Q4CAL9jsxQVB+fed8WOxyr3mUjYvrdCvs4aVa+E+uWZtVVEfbEgSYmrKWLf3/7beI8kxD2l1XqVNdxWcc772g1NGXLOJYRvlxtt9mjw610lVeken6Zrp8xr6UyHFYd7oOydrI+BxsEuO3jDfUZl3KYjLnLgqxolavDtQnPgKbs6SK7idqxxEE2+AKdCmFnMFI6g30fHYz7XKZiNKTXgmll2iyPm2ybhXQqOoTJeCAK4Rm73g0BUtzSfcRRrVuuV98j3yBchnIpDjnrxpNePYyzJcY6rBiftiEHQ4z/uvZ1dbKSYsmhBdQhU2x2L6l2CYqE3CNzV1L8945R26LTEoY8i+nWRssekRRah/PW4gbB/DA68xp3qNHvUDg5b2zaBfREUm8vQNBZmktTM524p/Z1Wb91A9V0jcsOb5AcPhq0mUVJ40LFZkuPmaPuv9wi6Bnc/A1BfJprd+RzhXk/hrkFfJESqsj5UgjQLxpNIZKeHHEmFNqFzu83SjQj2x8WxP8LFEi6waXEEpSWpapKoR3NwLivGJJwc4UmuW0EZDmcAT6n3Iqwy2JkvVtdx/Te4UmYHvhnhSfU0XGtZAlBjYcT3VKSFlvL1/a9bsFQsGZYpd6hrms3GjkLTszkKnFaZCOVijrdYaCkHwl4IzLf9M8xEesZ6z3p7X7wZNZuk7+8qU2DodJRZlEMXm73yqan7ty3yFQJV6KlyWo8evy7y+io2r2XXnmrEnGXDoJIURtXn0TEDldJ+WQcTiS2PU+gKC5424mV0uiSBZ9zV71234tp45bgMPTqbTo1xqrePlkTj5A1tToiAHu0quTLpv5hUy+9MMYWywTTI6ao9KgHbm9rKo8Eqo9r3LThkCVLG1A5N+Q4QjQPBuRSLNL11OywXv50B/v6M0Ez5Wmrqe40Iyxokwx+rZ0xeYW/Y4zzm2Z2qVaEvrxCo1L+UCihwqS9sOFsMfmz/F/o8cOXnpV+RMbfbj8qqiwCSijeWith9PlmxYWDPMzAUPc9ztaUHHrRpVPyRKDEBDXjygAcz/LpXmxUzupwt10X+WuNrUl4hh2wQJS0hNcwmHbWy7oOEa9GHNsHDobk5zz5SulEoxm4SvTnv410ZDxvPRqqIKfN8w+nAPxtHW5WyNat+w6AKEjnZR1YomspiJuM8Zwa2mSf9gd3VyBU/DR7ffxMFJbhtaYFjazawl5y7mlk1+l8w9Xcv017J0c1o0gymgp5Ce96gsrs5yB0p2xWiq9i30EyW+8VwDsUKXbnxoPP9FAwplvje9GmGPjCFC/Zs4WBPEmtppY6w6RMsruBq0= X-MS-Exchange-CrossTenant-Network-Message-Id: 3d152a80-ca3d-4318-7d86-08daa07b1447 X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:10.9247 (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: Ha29X3dAhKS9NHd5l5yUrWs1jckL0vpht8YOi1B9aj0MKXAy7geSd1/GrgYkb8veMDmLC2W9YJ/v+ZxEgF3hYU0EgFdkgyerbll1TNPtG4+Lb++wV5d/b20uuo5l9Ta/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6797 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 cace897e1db1..e7eb7c0ea7fd 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -130,6 +130,42 @@ [PIPE_D] = TGL_CURSOR_D_OFFSET, \ } +#define GEN9_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 \ @@ -664,7 +700,8 @@ static const struct intel_device_info chv_info = { .display.has_psr = 1, \ .display.has_psr_hw_tracking = 1, \ .display.dbuf.size = 896 - 4, /* 4 blocks for bypass path allocation */ \ - .display.dbuf.slice_mask = BIT(DBUF_S1) + .display.dbuf.slice_mask = BIT(DBUF_S1), \ + GEN9_DDI_INDEX #define SKL_PLATFORM \ GEN9_FEATURES, \ @@ -732,7 +769,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, \ + GEN9_DDI_INDEX static const struct intel_device_info bxt_info = { GEN9_LP_FEATURES, @@ -886,6 +924,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 */ @@ -983,7 +1022,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 Tue Sep 27 11:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990453 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 3E08BC54EE9 for ; Tue, 27 Sep 2022 11:26:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E1CC10E8FA; Tue, 27 Sep 2022 11:26:41 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BA3A10E285 for ; Tue, 27 Sep 2022 11:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664277987; x=1695813987; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=z2yY3PetE5NBJeIo6ZcRkuL2TaKfUpx+2uosAuX6GIE=; b=UwmXblm0rLE2tkW+fywgB672eW+UB7AqCGV4s4h5hOBb/DPWQdHvUwdw /8w9eB2XQxUaxygQXoA0tRVBdek64ksPxis7+m6TrvmM4t/qV6jm62uHb f1n8z7KiHQ34iUnm3dK/l+9rN7E40I2UE4Ld1W+H+DnyBJ3vW6PekIaIK iUK+fM1VsfV2gnsA26dJf+iHgafhUSMRZgzHH8MStO2h+59LE/o4XiR1O eylsAnzsXi4KJ8WkE6oWQTu8r2s0bzrHhUNXJP66PoaAqeh8HD27cGd0P BJYOK06rmkhzWVBzDlzNgpyO+3fTuz0teNYG9GU71FIvzk5rbL24m4Y4R Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="300011538" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="300011538" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="725476999" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="725476999" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2022 04:26:26 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:26 -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; Tue, 27 Sep 2022 04:26:25 -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; Tue, 27 Sep 2022 04:26:25 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.45) 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; Tue, 27 Sep 2022 04:26:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LXo5/AE6cce+qHujS4vEGRV4aEgCxDA9dQ4RxwqZo6EW/hc4ekyw8+lr7ZxQUOoa9zYTweil4XFzf9U1NNW5W4E+9oImSUnFuz7Cqv70NVyGBJD0uzlZr9yr/2ujQg13eLgwbvqyE8ESJuH1ra+1YwfVOCCOzKM7Iws+4NabxxN2hpWj1pdFnDZRmEwFs6a1RH6tZySe5FhF7YEvr+bN6jEOXEZVTC224Gq5wL2mZtsOAS3m9q1a5k6f6gjWPPxqdwagRKsZrWbAh40zv/QZs2rsCWxTmAmaU5LBmT9VJINXbqQ2EwcdLFlo6EcpXyrI9pLlDeUbUpEekqA+gqH2tg== 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=su+NuYyNrn2/5PfGrxkhM5WHpp4ozdxCiUAtcoWX79o=; b=JgDn8f+5ueWH9nwgPF+YOZTvLHUBYjt+2JJLG3HxJ39LMuw/OfrWktANdJD1J+mCv+PmlRPHU5y4Wt3ZbYIKau60KO1KVvogg7bsZadDNSur/jvfZEQlZWVq/F6vEcYaMaaOTjtjaSSGebu4SeDXQjuhCjNd5NScLr8sgIIi/ZeAe5ySKtVyYSGZixzPv3b1krD/BFMTCuHf/CJ9Bo3K+pXZ9ytokLvX+IHACCqRMms11YWssJFwxxFdCAOXvkZ9cDiEhVKKEkXymSlnjIX/5LuuYsB56fEL0DRAkvCzIwsiKUIMc8Sm2r5ZAiRpWxW73z/tK1BePOd1jfiXPLPieg== 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 SN7PR11MB6797.namprd11.prod.outlook.com (2603:10b6:806:263::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 11:26:24 +0000 Received: from DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67]) by DM5PR11MB1897.namprd11.prod.outlook.com ([fe80::c0e8:f5ad:37d:ee67%3]) with mapi id 15.20.5654.026; Tue, 27 Sep 2022 11:26:24 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:44 +0530 Message-ID: <20220927112547.328078-4-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0037.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:98::16) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|SN7PR11MB6797:EE_ X-MS-Office365-Filtering-Correlation-Id: 59e8b57a-6c75-4fca-7fc1-08daa07b1c2f X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v3u0pyf4nSY9ykfn61/NNMg0BhRivOFMebdLLltSnqTDGIipCIPOMokjIUKzLiA+MzoqsWgqJESJp4n971XYYk8YDRayCUmw16XOoELGg1ycJgsw+y4yKf+MhWUDGofjsGMFhNpsvTvqEaGbTdmhcB8aIbxR+3Qx6u5LYCJ4mgbQMi6T4vs0onK+MNFEfbS1roy5TXIFX5ofTFZIsqWWEqRbrE0jC5ZlsaG1AvqJstfzh2c4kyk2h7266LAdLYRaZpBKRjueqTNI2StJK2Eq/rWErtkGQyte1aoxo/LP1rljfnMqWiKWdMq1apVdQXNCGexFiU98mkEhK8vEsW6y9Q+8R9vW6Y4vrDR01jvzQIRXe09BPsw3b+vtYJg6EDXkjGYc1lGjPRUhWljdss4UUWkIQ3x4mGHTNuDuch0x69TjI/Ml6ESLeMbfZyCw5kpb1p4DgKTazHaKNvL7b5d4VHmUhsdzeaI0A0CfVZ7J6kz7gvarYSr9wqT66QclKxxLnYPnGIDPZHdh7VuiUYSHhRU6ibDq+RzjXuaGfOBmM9k4IrhTKK9Sa0Npsf/eXg/Rdmht3ws+QO79HOeIpTC/N79SEAUBT7dlWe/MDeLcuU+VtTcDRW8YQK+shsE345WhqDz5WQDW+D26Q/k3IOHrRsYHcxE69frSOd+fL0ULDKJpNJXNO92tbtG6R4h0jAdW+oKnMo/oRwlZu6gHzbQIwA== 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)(136003)(376002)(39860400002)(366004)(396003)(346002)(451199015)(41300700001)(2906002)(44832011)(36756003)(5660300002)(8936002)(66476007)(38100700002)(4326008)(66946007)(54906003)(8676002)(478600001)(316002)(66556008)(6486002)(6916009)(6666004)(86362001)(2616005)(1076003)(186003)(82960400001)(6506007)(83380400001)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dI3+rD1RxvA/vV/9uUpxPW/bBMftD77KfNqet+J47VOqS0mKoNkWrl++zSSIq5bgvPrItgygurhSue+T6IAcmAAMLabJHe8LkrTaCi9gE9CJkLpuGd1bq2/JPj+9I3RbAAVHt4rVxAi8VdG1NTTzUbcBB9zbubo8SLG8TJxzuYVDZc4jT75eBazTVm2SsMm6d45t9NIkOEoWxU83tV0DQGwif4rVqvFGVsSqjPxgzpteEuUECElKK40vG76eXYzTVwKSxJJ0zsLb58dma2Bcyk08B7Ia6pFU0p2+gKmqAUA0ZdEzlO/w1Di9tRrEWeojwzCgr4Fwo2EvSAeOgHaSNvNiwGfuDeQDpOtX54RynvrAkAN635GpbbYFFYQTgzc0zBdpoNthKPnvV9bo2DjysQVUDPO4ChBlP0dh6hBNcVJwFzwanPeHu5JUlRNR8Exof0M7NQfft3m0rg/S1MJLfZ+KpaSoM1XyhUhhOo5ZlppesMWkQ7FBeNy3Qc5qLU0Tt5m+3d1cPhpQ6Rm+uz6uj/LwCmchigQ+RW7B3jIU+JjRQkoX88E+bpcRrBd0aW/btVEfgL5lPyPyCjaZ9po+pux1vxbP6rFyvpc30wxoDOvD91uXBCp9Pf9Mh+4fVekcyAZbNPzvnoSbdKb5b4RdFQKUMRoYwgJTNFERXRWn9YymW7L7mx4/BGGwi4kOjSZNB6C/4iTR5gA19qWkCZ858YWXNRbuxoxou3GAZ4E2BnFdDb+Ax2CXzGFyuHm7WnaKg856epj9txsvXdfIWeJaVHEXU3VQdrq9tHb+fNbr5E8Jwu5MjTNGtxzpiGt9fAO4/hznAIzTLM940voe/C/stbWfw8WHeju+5qme6jteeLB2RObdRv1bUyns7Z9RoZdvv3C4a2/rIk/iRns4ZonvPAtiQ7XxWLUI2V3S6EMe4+giD15rQ5+Xy4a5DwgKhDaUlYpirQgCITdKZ401upy4GQ7Z/53PBlwYbe4q0bwrZ4SJaE87rhFqLaEr/T0H9SCywhF4KaUEHyo+pyURwnaXnNs1T5o6v+oU1cpA247kDJq+/S+Uet7XyJfHyiwONQU2+YsSnAxbRNZtUYOT1uPqfENKqCLi2UICxfTu+02xroVX8kWEn+2xgpqGTkrv8EsLkB6YetdJxbp1kKO1+ZSjKoPbXmP749xe7hHHewatgO4Y+vjbIFRsizQ3yIaWSukqgfJAbmDgxrVbyCWyLJPSNn3hbvNF2JsI9pq/IT2SLTPCX1F7ZHEbHJ/cqIrBtfCjU2OgTVt/ZReAdFza+G4kBhTEZviasvC/1rtY8PhXIpT0v8gBCUFtEfT35wapmR2KD6dJ4yNFWIsI0ZwXc9PViM0JmlV8HQmB7il/f1atvvAQBONbOIzKLa1eUaatnpM2gv79oVB5XHVz+oR7DE1gO2McwBaH9SGSNXQo1/EEWwN5sw1H651ctLtSn/Wdc4x6tNZlcviu+t/Vfbsu9Ds/l9D8hWLTmERWNbEmMKpSndpSp7MR8jlAsPG9TjV5clARHsYvGS8z3nQgE5F+5tOKSOntRPVTwb2ewYCbH228GauOX07YkJCh6jn+JEYqMNt5ByaemFRxkeVU+DYoHj2LPAEVLC+IZX3W0BZoTe9pjD0= X-MS-Exchange-CrossTenant-Network-Message-Id: 59e8b57a-6c75-4fca-7fc1-08daa07b1c2f X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:24.2205 (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: T+DWhvAjCqx8QlEh9LtHDJWOAigIuKiBPB8G2vk2YkBXlynZxF9mhJTaD7luOITnbCN5kHB8x+1FcIx0SSJZ7toPuDHUaIHGYLoim+cyf/Z9VDwfeBTWtp6v3KkMzcbQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6797 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 aae429bd2e2b..00ac683ef96b 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4474,7 +4474,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 884e8e67b17c..aa5ded6b513c 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 67f3b17b2360..12a6fe7ee010 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 Tue Sep 27 11:25:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990470 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 87FE3C07E9D for ; Tue, 27 Sep 2022 11:27:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1BD410E8F3; Tue, 27 Sep 2022 11:27:25 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C9C910E8FE for ; Tue, 27 Sep 2022 11:26:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664278002; x=1695814002; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=f2LqV4f8jsYfki8ehpGhiKhtI5IMKxJRNl3qF7UMG+8=; b=ZsZJ0Cb6/5QnYGxFMaYRMoORHU53tRvm7bLB5nEaZi64SvSdaC6IgUL6 DuT2wYwDruoDJY3Xi0YFYJnukciFXq9T8GRPiXQ9z+6krG1y10U6lq9Xn r+kZcWvlF1n/GVy/IaUVAoqzszLphIF8Iwp/r+i4XyEcHZYSG3d4ZrSGs gCrqk+bVLuopiyEGk7ngSBxZOnIXbKZTg3eA5qYbJZ8SQV1wgUGK99j3f QRL505iHMkkUW7ORgoTo4gg1oTAJjRRxQ+1p40AcesN8jviUKzkPReuUS PUPyFdj9qzdudgQce17NG2jy1rVwOINKQbRJ9ATllwGGBc/DeW2Z5qfxm Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="288441335" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="288441335" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="654691879" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="654691879" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga001.jf.intel.com with ESMTP; 27 Sep 2022 04:26:41 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:38 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:38 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Tue, 27 Sep 2022 04:26:38 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.49) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cE/6mSGnp8CuKc+xBaNo7QoO9xjV8EeXFmha2oYVm1E/fAqyATFgb7qQ2uIehEj6TKkTMIE3AFyrcrj8gcV6DBKtOnw6UGmzfCzYJ+KX5sw7vT+pfPZHJHyK3upabghvnJ9B891x7o+28Glxxy9FgUgbuXL+vO/kve7NNDrW7/CKTGMG/gWTRNOKb9vi7mOAILGnchmy5/PVsxJ+iMnaixY5mFicIN8kazGCQ8Smgw88QgU4v6t5BybE2cerC4bOxGNDztqiRy0ae+uF6+HjkdJ+amkscatMxQUm+WpwUnPAEu2pD0hrcwYieXir/+gh2c3oOveca2HWysrkKuleow== 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=Hj7IWU/9uE/GJ+1vXyR7ZsHyYup232pYtqU/zOu8osc=; b=LQBOGvDYT2iZnt1X8y7mLBTWQ/OMuOajVx9gc6qVJyWi/3gER6we9jM8wr3ooi4MEAixAr4FbNFhh7sXN9JWPSOZ+p3Mao0IAxOrPU8iXg7O+iV89BNEYIoPAJSfFyr1CbUjyVfINUlJbfHj7oaUsJzzHfFiHaCRtYtX/53VLwMr8+XJkkWQ0hNLyc/PG05yh9IgRFCpB4zd4IC0plrU8crfAEswp13/tPRjYQujwaiZJRLw77i+ye7UwgHoMcyDoSSo61k5fUQkepFiHyOaCepI0S7sB8KRNbc+i8dT+rooyBrRDl8uJCDAXg7w1WnNXTF5sAGX9Pu6PogcmB0wEg== 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 SN7PR11MB6797.namprd11.prod.outlook.com (2603:10b6:806:263::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 11:26:31 +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.5654.026; Tue, 27 Sep 2022 11:26:31 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:45 +0530 Message-ID: <20220927112547.328078-5-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:97::12) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|SN7PR11MB6797:EE_ X-MS-Office365-Filtering-Correlation-Id: bdd6a31d-3c1b-4ac8-26b7-08daa07b203a X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VQTsDGtFNN1zvbZlHLSuonMWcMqo8I6U4IjiaDGalfXQhPqaSHISQbYhOzJEydWTWBTsrNVJycn4Fx94Nt71hkz7T5O+0p4SME7m2TiV/Zqsm0lO78AFHDCmhBocVtZpwCajTdZEdDyz9DXx6F2WsuQsvuks158XPHl74l5nr28iE8RR0LMHHS3MPi6u2es3d0okZukBf57H++5+HoPM8uzCZqNlbqzbL73B3FLP3wBQu8SNNfy00CcGFn4jFez7a3+Jrc6wdt8SD4dPU9GUU1sDIhypaYZZcxDVzqeVGYDApQC3OJsx8HhR4MiJYiNoJxWsHezQjsk2+7FLuxVcUBJvOslf8e1mDKBzMm9GRqwl1VCcwfO4ZtCRxtM98lMmSXUZtIup2ryj7tn1t6GxK3N6hGblQ7AstslJ5jtVmNXkWGUSpBbHiBGyLuSIEHoKxKZIGKlH0AIy/l3S3IJZGqeL9qosO4zSPdFLXuZ2ZeW5Qw2dhUz9qyKOtXK1wxvw3D4OvvYWKxJX1qgQso9tfVVxdBV9EdRvWcfgX+4Cc7wad3TXRbSYVbzh0Gii5FlcFIp4Un0DD6rFcSnr6DwS1/JeZMGIOmmGgAFOni5NpLsEz6e5FytIzrZSOp4Cq5EnN1l2QxNEyFLI5TDNue5p3hzlnyN4YlwKO0wg27T0TtVmSENTERWgkJN/dLkilRiC39epIWdTVpzL/ruxxFOCfw== 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)(136003)(376002)(39860400002)(366004)(396003)(346002)(451199015)(41300700001)(2906002)(44832011)(36756003)(5660300002)(8936002)(66476007)(38100700002)(4326008)(66946007)(54906003)(8676002)(478600001)(316002)(66556008)(6486002)(6916009)(6666004)(86362001)(2616005)(1076003)(186003)(82960400001)(6506007)(83380400001)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XvS7tsaLigLhXVPcscraoWnB752NIu9R2zQQJr3RmuA90Sfc2r81W6b7yvZfb+V/iUxDEWHvSZ0EA+G00gtIlZm9fsxowh1N2quzpImcy8isFU+p/ShDn7h3hYu7GfE4uNVUboseOumvq12D+8JYkty+ZSTRdwb/ELps85oO+CmZC7UsdcT21Jwek+5eG5/6MBOGGhKZG13lIKVI81xexBPLQLkhuiN5DmtecfIi+OXYW3qP2N52aaAv+5OG3YPvGr1tpq6PvkzuaELMItAV7kkHWaaa9iUTa+yoFZzU08JQr2S1tW+8PJ/iAwyiEtjyJMIQObBiV7eiZhRzhOhPleAjUN/hsZo3ieB4+zWjSLluUpa9k19+SCCNiRJSQRBzoEnivEKmc1GnPW65LrwCD9FOslUZ3OP7iLmj1GpUjgqusGLo0vimTV2zuZG8/GJdYTsRW4OcFcgrHWAOaWnuDQNAhszENwZL2Dfp1O2mj5mrkqF6GigxUrmnFLLxwQiwsLSn4j1MbdHeI/FrjE+weJIGsNct2+wlcsVzxLhcp9rLg1tmMAdYgJ4KOGVIvMyOrQ1d/uS3ZWrQMx6JD+FSr26AQQJUIDCZR1ZMcXjZwdWzU7vOb5syTPvYmgFz8BGpY5GOigdyZy0SE1E/cLUMzcjQnv2LgDN8PVrFaa0xKuw4Du0H2G+eNDK4RQLIccuS43ltk8f2cPZZ3hTrw8UQxCAE3G0WFykwL4ztD1XBZq2qD12ZqvYdEha7auwZ93/HdMQ9ZqP7Xd7QpOmL8nvmrLlusQZG8fjJ7n7WJvErcFnGLIkrPncGqNYzREYpUgk8lYIcLf5+UmHX2i2N+EOg2AObBPtEBKYIJIKfT9cnZHgpq8eotXdTqsYjl+jRIG+Xq2ZoBXHK4VREj6BGCG/hWV/x1pSgzc0Ssx9T/A0VXTtw/n0PHKtzVD6iAeADJwSkl+1hrM+4XgH7Xff9tQ714FdTy/VwDT/4CYdfrJeWH2t7e+K2pD5wmgxBlZ4IOAMmdJrmWhmIGcY9Kevxfu0P8Vv6Wuoi96mcpfX8SV9Tjv/tISyy/1E/8Jnxz2eq5EHwz8WE32KJToveyYbeCYI7HFas9FoZ3/uXaUknVBOd8k/FAWa6psT3yQOu4C/OoARwiksGGLfl9UIrOLuEkeGlpkcvEncsAA2y2DUYPjQGwOFCbfIN4QAz6jowvfmVlC6ZUcypVLK4Cpnks7wTE7NXQrnPEUmhOZw1v30e998apVnt94P42AtOsdfUiDlN2KFzp6aU8/vPmH6sZhofgkmyPSt43/qVFQ8bHqGj9J6uV6IuJNThOLygDUIFjVhyRg1PHOkJajajMWNc/3IvEA/vKSzsIw/kvtuSPVf+5nOhhCSMWwCdzTaX4/Z90gR3z3+2rxepR2ocpt1eRkAM6m5Ijgst7aDHTVcRzJECv9bOMg2iJC1Ex5GCiUyWDubwamPo5v3kO/l49CJ3HdJOQ/PnJXTSs3QscqERS7pwiy7lGRFOFEtOv62E+J2Hw5okh+zv2Z4SZltW4H0d+S+7eLE/Pw3E2O+y6TjADJ8zIiVgPwbg5wKUN4ZJgDc/FH6r1e5gu7pwJjOhCN/IeAUrx7kj2QAFcij8ILDaRcUuetYwkJk= X-MS-Exchange-CrossTenant-Network-Message-Id: bdd6a31d-3c1b-4ac8-26b7-08daa07b203a X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:31.1730 (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: iJmTsEMLkJBFhoW10cv634WBpiXPqkspqa48+3a3e4wgqPmpaIDo3WcQMh2m6siQZ3KGQhXWKKW9Ck2xEd3kll3L67NnUBsiTw2H6hOn32BeZqBqEK+bSWi5phRtS8zp X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6797 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 00ac683ef96b..73ef6e97c446 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4115,17 +4115,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) { @@ -4294,13 +4283,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, @@ -4430,9 +4413,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 194a4758ee04..caf81f4b7f2a 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; @@ -7903,7 +7901,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 aa5ded6b513c..e3aa8080b79f 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 e7eb7c0ea7fd..2cdadf76f34e 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -162,8 +162,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 Tue Sep 27 11:25:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990454 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 3A5F3C54EE9 for ; Tue, 27 Sep 2022 11:27:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DB9010E8F9; Tue, 27 Sep 2022 11:27:03 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id C67F110E8FB for ; Tue, 27 Sep 2022 11:26: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=1664278003; x=1695814003; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=cDe80GTDOq7XthzWWpdTYW4RtyyYixBLBb7Ihhv6Yfc=; b=GwZudx/WAfaT10PmL74veIlU93TAdwREDNF2GUnfCVnfnjB8gsO3MXhV 8zNb2+TU6ekj9yS09BsVD8Zdjzr1TVJpa/z5LdixbXFicXOPhPU0yLryU a0EFNkeP83Foj6wQtKjPThx4Mr5ESASVTMCJp9FnL7V5NqJ+GjB6ehxPj sv066MmgAknd1+xyGQtNVNvp2beskVyOn30gwhV/KxuEJM6xm85NWqmo7 wSOfb3fhMWZVqVwpNexKIAnVrohOXhsVH2rFZsHxPbTuW6v58p8atHmN1 R5SdOq2w2RythF4XTYNlyqJ4Vp3ir+LkG4arvMZN4sGr+Q+88T65sxaqr g==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="281660830" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="281660830" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="725477028" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="725477028" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2022 04:26:43 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:42 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:42 -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; Tue, 27 Sep 2022 04:26:42 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.43) 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; Tue, 27 Sep 2022 04:26:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LM9igvSZpUqjSAKrA6JrIY2WO4w7BzyrIf8saLmcO7rRDcyY2K3YkaJuPhSSnBslT1fxjW2JHLwaw6qTVS4o/qun238KmaquXLPQv63J/A2rMHOrWBU8mgZtBU/CQGa7kXf4ISxybF4ERdVjgD9li1wJxc1hz15CrUc7jdCGjZA4BEDbhzlwRDqAbkEkIp2RnSfzNou9Djspkk3r7y6Ovt+WVE4uod/48EXH/hUE8ZdgRjeaQ4maaZrwpG8upaVkbZe+rtSGv+SgTAOIsxiFLUBB+h9Hi6alaP445u20UY3xJEDcWZ3cUqjqFNKfuksMw8PljTUVqPfBKRZX4s0o4Q== 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=ltYAzC16SiBwlags2QdphOy5WYH39DinZ4Iyx//8jv8=; b=FOF/ZALU4FQnu7z07bFod0NBA2mIQtQAu2aLOXhlQDoWhiniPCS8yn5ZmHzj6D0JrDuRCqWgQFvB6bGQ+DXdvzNFi/t8Zy68Q9xn0q+CEhDRWi99jkuwoPAM/Kcu36E75e2t+e9d1NcjhNzI/k8Lug3tij2Bcx+l+ml0Yei2BQ3MPq0xGm1iXBgbJsqZhzggjk4Rg4kT5vox1MNgDdk7yoq7dArI88n2DqdHbGEYl7hSH4NVbirsE5LJe6wenDbkTrQe2vSW5u0TDNcr48EQ5YzIBfiSNC23lBCtf2PEG9Ew7aEtin3PgUewSDtYdQAIilfP6iO8PfIBv15NJzCPPw== 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 SN7PR11MB6797.namprd11.prod.outlook.com (2603:10b6:806:263::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 11:26: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.5654.026; Tue, 27 Sep 2022 11:26:40 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:46 +0530 Message-ID: <20220927112547.328078-6-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN3PR01CA0029.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:97::18) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|SN7PR11MB6797:EE_ X-MS-Office365-Filtering-Correlation-Id: f6543694-5645-4f4e-754f-08daa07b25fb X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DVauSJfaTLAOzo3BVhmYc8c4+n2KeJ4V3orTPSkxQVtFGyqd2W4OwhaEnzyaIrmlwFxMDeDzBOUj6iLwK5G6AmyduLR38b8Df0b5o4YEUGPNXzFZkDCBM68wFYBLikcCAH2d2brKYfUi67S7dIpOEuAxS7PwrFARMtHhy8x1zHmngf+GEDFfhR4sRMGLmaVkuRcjbyD+ghuNoNQxKokpPAhk++q36E0fp0xu/isYJTj6ca8Vx4fkVkjyPxwd6dJVeQP2W1LOeTsjA6dr8I+uiZbZHjuK3MW1jfteYxyLnKvMBuSzOHchnsYKdsNtvIcH/a3bTBgMOide6cI8vJ1/MZ0m7VLdf6WKRc7iHlXzMfd/FUXO7emyjgXq8zoO5mrf/xoYN/fNXPLPaXbCyRBhgH5/+5/xgPhuc5xBKHexEZ5tz2G0kCTFi5hzueISWC/UEUrGcKCXgHaW6wmkXtQ1Qs+FrF84GDaz8lvnvlAr2rOK0cYO09ADMWCqgPjgmu6ReBx4ef5mueRsxgP+ZmpWSApaf68gi9CproJI+fb0x4f+BimEZyRf/uX8i6bzGI6FCNvn4UoRri5fv4HQQUjyuCCV9/KDTXQu/cLVcBZ+Vj27pk/i3Y6MouZX4e6kD+zMsvF5Tl/1BKK4Lj9hT+Hbnue7JN1Jw2+6a5ZQmsJ8u+XVtoyucsHkUYytL6iHFHCuwuYbZrZY6hZJq5DOaflnaw== 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)(136003)(376002)(39860400002)(366004)(396003)(346002)(451199015)(41300700001)(2906002)(44832011)(36756003)(5660300002)(8936002)(66476007)(38100700002)(4326008)(66946007)(54906003)(8676002)(478600001)(316002)(66556008)(6486002)(6916009)(86362001)(2616005)(1076003)(186003)(82960400001)(6506007)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e9Rqd7KIFhWSV2BbMXDY9eV9MBUSZuaDgR57kAyIDjYveNdgkHAPRkaiynRoOXu/UYMFnZJJrXe+3K/A8faHWBt9TRqyXVY3Hg9JA6/jMGTZp0uw3i6fl6ttKCRgYwzjROjwgkIZRUIWHE4ZAkSVlZeXOmPv6FE8j5lxRCbXtB6Iswdf8tzVvh9gZDScj1N5zcXE2TzeBoS64Lhl7Qvv5PiN9vpJVVNOyf5/Nzt+eJV9xdXzOWeK7YFOY8yH35fIIMlWxFOG6kHeizpj6prkmsTgWLBX07IAukl+ArMP3ATg7tzC+cQwgbuGu1Bb5yPyQisDr5N2LzZegTKYDXHcUY4I08289x6V0Y4LF+V5waFLuSkCbg9aE51pF7FjpXYONZWI3Syt+SQihEDf7TTvCVQI1FBVj6t/7swn+QTSH45wWxp6tlMffORrzcHc3eP4Z3Ivgv5CxxMoDyF7oBxgnRolhIhiScDRuUYt5jN7oSClDjGsaE4/5OngIYyIur4SA26pYsUDOHiV56/RpKYKGYZg9NhGm4zZRv3J9RuWQfmV50fVx6p860gArv3ALxdJl9OxK1EwpUr2i6c3bT+3OOhjwreojNox2RnD8rYQkyoI6YiFvhidJC7j2zXku3UjsZQ3rJN7Ve6fvWO49ITGTsbIxmSqmIbl5FNh5Z87jYdjnOrcehXu3io9xznD6W5TgS7iWXmVD5IztgADU2k0Zp5bL8QSKQQZMdwvHHcWTNejqGjBfdhyZaNrsDxMBqLli1r3LsLAi1o0DRpc7Wve5oMC9lafKcNEA43XJyplY4Uz5aSfSAIqUMUXrcNr0NOCY7wAvEjeA8aeDEHv6Fu6eGMT/w7hqOvHKZ1lKtbqGBEF7RQMYLDvJgv+Mfi0FAK9nM/Do+AHde3VbylBxt9NYY7j+nAvLk73Kbs9dbdWXhiicCYwfpBCqVUQ5zSXxhnH2WW2rxEIT7yZhC1R3eHDVkyHe4ddLJk3Of9H121Msnp9FpJPwnvTk6f85Fan9d4b00VuDmr5KRxWZVyBPLoqJyiD70XgmCWpR0KGskYyhC4GvnYyjqD5/v16sHtCpZjORL+u3hog2LbKr3VSvNTfEid2m+Y1hwkWYmd8xHj1zc1mcIjocYk/0RYGMZgTwkO3iJyuwhZfM9wi3jIa/P/ycLxBAmN65xp63yr9N+hmKX111kkd3mSOGvtIW12txVnlnOMRI8nWNYQE9O24T0e4PcwGo7OSl0P2XpLi9V9NizMIK2K5cqw9OzhcgLnPYRzjLUGyWX6reCBWl5WxW3yGbJOQOwnFDDgXD1ai1/78rPtYE+XnPdJTS75+sG08gGXyjVrhbHAb329BUG40MOjWZRsdhSBY+MnRDj6QWGuA5laOpDeADWnjDq9bdxB+E7Vuh1eEswK4N6fdto7fLtk3mKmDMKjobQVmoeUCmyWCN4p2KU290Ci4v5wSD4THPvotKagyuya7ddoMQkKsQUhH+Oom5dSxAs3tWjMB9e47AFLCVfYJYnZtuZy56WtK/Mj6MsSdG86IlS+ofhHq0ipFFxql2pvc63YNH2q75k39WQzOVsSRCn3snEPE5hDUb6WiHpxuFCiFGgslR9k0CegqUZjuDmKssXvI6v9f8jOa4OI= X-MS-Exchange-CrossTenant-Network-Message-Id: f6543694-5645-4f4e-754f-08daa07b25fb X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:40.8754 (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: XGfVWAatCSIlko2IjCbz1HEBuoT6W5E/fUxV0pbEinB7eNXNM/5S2fxSNc19DOUPP3l/NTl63zj/UlZ6KJq3ehf1sOTQklJBpWW2o8jwU/+earDk1QARI32hbD3wLfVX X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6797 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 e3aa8080b79f..e0d5a9e569d8 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 Tue Sep 27 11:25:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivekanandan, Balasubramani" X-Patchwork-Id: 12990469 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 06CCBC6FA8E for ; Tue, 27 Sep 2022 11:27:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D87C210E8E1; Tue, 27 Sep 2022 11:27:03 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7AEC910E8F3 for ; Tue, 27 Sep 2022 11:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664278012; x=1695814012; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=fST01bqA76R7xrrmrsU92SIV/RblW/u3R9OUtcZ2Cws=; b=mAeJ0JsiLvdRoIBoDaSowTnpcqO0yzMJ+GOpmXhWDwFDcbGeEo42R4Il wB0h2PR9KwSRWNq2Pxr8M6+UkSJFeO0P/vUFOMsnnX5Vn/pUu8JTAw86R cCiBX7MaWfM2epZiwXOGspSZbg1xt9sIJcR0q3uaKoTAtmjWzdklluTuF YmM7v0RmnzDUURbpZcMyEDl0pMpUpj+1B/01DUfG3CLRZZ+OWL8JuRVl1 S8WFFXepU5aKKQb9jd12+QdOIJzTl3z/cdhugu2AE7AS04dGFsk4OL/FQ 1gMidNp1IIr4QkDamn1qR5h4gib6PQk6Mc/g8PX6jiPHmUuKwIivYJu/J g==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="327647667" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="327647667" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2022 04:26:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="725477052" X-IronPort-AV: E=Sophos;i="5.93,349,1654585200"; d="scan'208";a="725477052" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2022 04:26:51 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 04:26:51 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) 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; Tue, 27 Sep 2022 04:26:51 -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; Tue, 27 Sep 2022 04:26:51 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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; Tue, 27 Sep 2022 04:26:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nlx2FcfgYnvijT5wvAIo74emTEFWjnz2wjOFFheMY2rIx7uCI6Z6N46uMOePMThyyDboKY7rWKkZ74LcM53Xn5Gc62Os3m7WHwWI2uz2bPozvyjdO1AISXOVcsEMXtU95BX0sB3C4VfFYQE9RKzUkhb9ehnai9h2QvVLpv+3J1g3VVysjmhP29hzx55ew/mM/KYDM6AVw8RC6E9aKaubInq9ZhfUG0/hfR6wDSRHZrTtfYvM3RkNOtqss4eRZrdlV2mT8y4Vx2Ptzz3fkWdJ6XMOknnLJ5dp/XVUrUo7pwXhcKJeESPMQbmO+zJodGNdMAJH95VfCawDzVOY8gXYLQ== 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=2qbqcHz23U2nm2OQFZ+baakO25xa8oyD+WBYVLU4tbk=; b=farvDefqdFFcD9D+qEjeWuOIGKr/HxrHM4R9j+xwNptDfSaIyCNUgs5XhTRjmZoeJzlliiKJhQt1bIWHTVjD7PuonMe9j9yZyOHEhdOc2IHweZ6qN8N1A+1nAXWHhXz+VOFekYpT56ni0xvWpeukPc+GpwzmVa+WH1Kwy4QoLP/XI9lSBhPEqy/TFyV7GFZDNPMeVVMCWln/uaWroILil89ohI0hKFnWf+mZv1TDLOye+x5BCnAQ8k7s2Y0TQyYEUdUPLjADyAz0VWGO06gRz2UYXtMmv91tq5chgm1qisblFQz+h+KdJj8nxSIO9jhfjhNSoSGEJh7Onau7GXUcrQ== 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 SN7PR11MB6797.namprd11.prod.outlook.com (2603:10b6:806:263::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Tue, 27 Sep 2022 11:26:49 +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.5654.026; Tue, 27 Sep 2022 11:26:49 +0000 From: Balasubramani Vivekanandan To: Date: Tue, 27 Sep 2022 16:55:47 +0530 Message-ID: <20220927112547.328078-7-balasubramani.vivekanandan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> References: <20220927112547.328078-1-balasubramani.vivekanandan@intel.com> X-ClientProxiedBy: PN0PR01CA0023.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:4e::18) To DM5PR11MB1897.namprd11.prod.outlook.com (2603:10b6:3:112::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR11MB1897:EE_|SN7PR11MB6797:EE_ X-MS-Office365-Filtering-Correlation-Id: 14193756-e625-43a8-09b2-08daa07b2b1d X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zpfN2er1MYhkm4ciG6KI3m5FIpMbmhSUlqOQVPicCFA+95Ms6lNdkaC44kJ70EZGNzPXhBc3yBsyM+52PEmbxXgZ6JMRMainhHCGd3kCR4j19dd2Tq1fcm2pGXXFbzfjGef46L5qIZgzYa30W7T1UUqCnUHmIphxn3IyX2T8uEgWevip63jLQK5vohoii1m363LyAymV+HWzom9mq3NFmebo6wKd/PwsomqQaEFqvhGm0bylkNDFIcKbE5mEacaGWajQsWAiqvPHkV0kTx2cCJciCIs0pXQHDdT4C0kR46FpRSz69KT9/TXevudmADFfkauxWACiUPcB0ECsj4HocEhPzoqkX/GyKAlZfXyuylNEhsBgF4CMecw6Wl9FL8No0OvPw5AB5RlEKmPqswuiyErd9sZlYv3Fixl7CtP3seeRqoOlMTJJYp2PxlWu20ld6gTLU2bisxA0b1VV21Hu8cN11u1oX04EOuRAzuEhHzb1bq7SpyHKgop/GOCaCA73Vky5oSzKgV8l8LAK5wFbYQSxAc7y7kXZxy66UfXnza53t+VB3D2rT+5HBZZP4qnMCSIO/r6HMb+jNpKm8q1QOvB4RBzQe+VWSFYSuRA1bjysRy+SugShtseTKvcbxaaZ7ee1DJfi6g/QD4409zrNQ4i6Yq28FxmPEXxgnuvH0kvespmJUXl/ooskEqO66q1PUDzxnJFBCd5QnV4e98RD7w== 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)(136003)(376002)(39860400002)(366004)(396003)(346002)(451199015)(41300700001)(2906002)(44832011)(36756003)(5660300002)(8936002)(66476007)(38100700002)(4326008)(66946007)(54906003)(8676002)(478600001)(316002)(66556008)(6486002)(6916009)(86362001)(2616005)(1076003)(186003)(82960400001)(6506007)(83380400001)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sDqf3GVH4696DC/jaQa/ujmKSt3z2uWREU8iZwx//5mOyEk8cO0HN0Y+81/uSF954yIeIbldqVKe7iDkNCNUVpiVaNGNwQ9fzU/9OuxtJXADXFdLCVloxCMq3CSj4HCTfxPLGM8R/stAhzg9YlBrQEqwFP2szwlzKNGeiKJ/WhaxONrOb7oChciYnI2CkTXnlA5vifuTnJOCcRQJbZhITcLXB8UHcyVk+G51MrO6sZgyTW6dqbVvb/VxBHHbB8TpLsAkvlRvqdQ5NUvU36l33iYeZyBDZOkLJmIU7s6KxRbmibhhFiHwZNYOJSGJgtFlulDath5tGMuqz4b0PObWTcx3lc8kJIol9yQrrs57GfQBImW/JqnX96A4bmR3dNstCBufKeggOEYuucKv/xpZSOjyY4k3z3emQ15XTXZ8/Pv1n1DIs+K/BT/0hcHMUZSUvK9xNdAOQIXrztfNdhK1pJW29yNiSYE/fGvDNIJRerZotvQuSMrA+xAhXbdsmggWSekAVSmBmE8vn3uIU+XLUu9RgCs7TYPkH8d4RjTPDPx2hXkB6J1b10R6D2TTygP3Ty9zdOhj/RrIa7V3ka7xtsRZDKWAW0YyxXRxJslIb/s7uW6v1DOpYtU5+QIbhgklz9gb/hbKy738nRWdjmbP7uje0trsMZrM+H9j5HFbl1EeY5PjTvyg0KPksakk8R2hUGRTctgNUEvYHRyDuu2YEBA1A+EgG0cz2mSg0n6GCn7xzkOTeH07QV3snhbxuc/fllnaFgEcFQl/HlACzzuRoa0q++BWctZ/mDKkqgYOKQyMiYaKkFDKpJP+ww8K5LIPZTpSKCmTs26VBhvpURg+5gVRmuHUkZCJ5HuMN/7IKK668MhdZLonEw5r0vwxttUEIG/fIdlhDQAM/qfLgxEbnhcLx6Cf8j3KutKp+T+lbG8ssupYaksOsSuhmsA2Tv4YR38FZI9/bH2GCBJDEnp37ETg2Z/M7CeMpvs6BOmUsDHU6j89ENIubCDySACjqCdUcQeJUuCpL0Ly1RPYtcr4N9oKgHxe100epURqqdCkk8hO07c9QAPpe+Fd/BrWAGXhhVLndFDvhHAVMTYHU+IQvkhq9tLphq5d5wnG18zCr7JjOMTlQeH6UB0CI+tT/lAduAfzXwahuxoM5Fb1O2yANV7V340Alr7RQAXWnb/LTYO4Wr98ceu8XDFGEy8XL2XBFs9RtUSRmHE3rRo3nGLL3daJqxMiKedwyDemOOYRXoBuYMCOeFeHXyl/tS3g2OJDy2GI1ne9aCYPib5VK3sGSd3cmGqwZ+NzTWaq0OSRW49SyNkOSwiFGrQ2FRK8xd8BHXDv4ugBUS9x38gS0ezidsals0HZhM/c0f4tAUKEeaQxYVnFF2F1HQeNQJq6VTHosk7m26v6z8Lhv/tX7b5Nyycv5QDb2rksZxNgTPZUdXfhNwCW1GM/0neXkB0tYC5TNKZ+kfo/arMVfYNFZ+nwWZ2HiNVOtlbZF4N5JZkhf1tq/ZM71+H+eNaYei4JDfh62PvHcyRSGoivcxpmxlNGsSqYcfSZn7KoLhoDqO8gnxVRzdsq20KoskGngCHQ5ArGsBiLppo0EyVbJhtDFEYvlYngL+3Vx1N6PbxTUcdjm6g= X-MS-Exchange-CrossTenant-Network-Message-Id: 14193756-e625-43a8-09b2-08daa07b2b1d X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1897.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2022 11:26:49.3278 (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: 2Qk/3XZKqf6ceCjhBXLtalAML9wXKIC8eQaq82vx6pq3Y2aiHvIkI22kibGgzMDXFgvQwNGd2ViRNQsqY1WCg8E5TGaGeweAkTJvgDhw29ukr3lss7IxeP6dBvYhU4l1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6797 X-OriginatorOrg: intel.com Subject: [Intel-gfx] [PATCH v3 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 e0d5a9e569d8..1abc5da650f6 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