From mboxrd@z Thu Jan 1 00:00:00 1970 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 B9ECAE9DE62 for ; Thu, 9 Apr 2026 08:02:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E91F10E76A; Thu, 9 Apr 2026 08:02:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FUsCaw3o"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCF1610E75D; Thu, 9 Apr 2026 08:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775721749; x=1807257749; h=from:to:cc:subject:date:message-id:mime-version; bh=TMCOMtxEzd9UPzJgn0a6zly/55WwgU0xxGAU68Fm6aY=; b=FUsCaw3oNFIstb3lqC89odNq7VF02CNMsrfAN7KRuOsEfInP+EFFOHvv 8F2n7isy1nn7HQh7q4L/XoHit/co7OE5PLti7uZY+gVWBcMjfLb4ZxQHu 5LsBI/tzJBUqp8bvpccvISlQWEl2JDGCi1fAL19pNgfy4bgtfNc+yDyns F27BZ8dpvG0NcZLbpIWYBRPTmT3iP7kqqvSSox8IsM5GSY98doD+jkyXR Q3A+Nj4TBdjJk/wN3PPRgKkiwfCSJvv/7GNX/x6OGYE31fkJQgzsF8/sN BoI2xvLEquRhN+1ix8etCQ3+MHRQyqLvw+s2cipOKhRkm2cXQijEKLrzd Q==; X-CSE-ConnectionGUID: l0cPBBraSJ6BP+IKqVlGwQ== X-CSE-MsgGUID: KAvyFB57T36B+ZTgvdU0HQ== X-IronPort-AV: E=McAfee;i="6800,10657,11753"; a="75757404" X-IronPort-AV: E=Sophos;i="6.23,169,1770624000"; d="scan'208";a="75757404" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2026 01:02:28 -0700 X-CSE-ConnectionGUID: k0N2IA5jTdCfuzsEvHykZA== X-CSE-MsgGUID: TC/fmssAT3OcqqIFL/N2Rg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,169,1770624000"; d="scan'208";a="228582888" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.62]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2026 01:02:23 -0700 From: Jani Nikula To: Rodrigo Vivi , Thomas =?utf-8?Q?Hellstr=C3=B6m?= , Matthew Brost Cc: Dave Airlie , Simona Vetter , Joonas Lahtinen , Tvrtko Ursulin , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Oded Gabbay , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dim-tools@lists.freedesktop.org Subject: [PULL] topic/step for i915 and xe Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Date: Thu, 09 Apr 2026 11:02:20 +0300 Message-ID: MIME-Version: 1.0 Content-Type: text/plain 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" Hi Thomas, Matthew and Rodrigo - Here's a topic pull intended for both drm-xe-next and drm-intel-next to unify the steppings header and enum between the i915 and xe drivers. I'm opting for a topic branch because merging this through either driver's -next branch would likely be painful conflicts wise. Please pull this to drm-xe-next (*), and once you're done, I'll follow suit in drm-intel-next. Thanks, Jani. (*) Hint, 'dim apply-pull drm-xe-next' on this message will do the trick. The following changes since commit 4516432284e1b2ad9e70de8067f779c9c1072189: ttm/pool: track allocated_pages per numa node. (2026-04-08 06:52:48 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/drm/i915/kernel.git tags/topic/step-2026-04-09 for you to fetch changes up to baf310b9836445ca9056f04ec347293963a1cc6e: drm/i915/display: switch to including common step file directly (2026-04-09 10:10:03 +0300) ---------------------------------------------------------------- topic/step to unify xe and i915 on common steppings header and enum ---------------------------------------------------------------- Jani Nikula (3): drm/xe/step: switch to the shared step definitions with i915 drm/xe/step: switch from enum xe_step to intel_step naming drm/i915/display: switch to including common step file directly drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../gpu/drm/i915/display/intel_display_device.c | 2 +- drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_display_wa.c | 2 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_flipq.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 ----- drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- drivers/gpu/drm/xe/xe_step.c | 2 +- drivers/gpu/drm/xe/xe_step.h | 4 +- drivers/gpu/drm/xe/xe_step_types.h | 61 +--------------------- 18 files changed, 20 insertions(+), 90 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.h -- Jani Nikula, Intel