github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge tag 'topic/step-2026-04-09' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-xe-next

Browse Source 
topic/step to unify xe and i915 on common steppings header and enum

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/cc1ff0a476ff457e88251e22b83c1a45ada11ecc@intel.com
This commit is contained in:
Rodrigo Vivi 2026-04-09 09:29:46 -04:00
commit d4c2512eac
No known key found for this signature in database
GPG Key ID: FA625F640EEB13CA
18 changed files with 20 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_cdclk.c
View File

@ -28,6 +28,7 @@
#include <drm/drm_fixed.h>
#include <drm/drm_print.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "hsw_ips.h"
#include "intel_atomic.h"
@ -46,7 +47,6 @@
#include "intel_pci_config.h"
#include "intel_plane.h"
#include "intel_psr.h"
#include "intel_step.h"
#include "intel_vdsc.h"
#include "skl_watermark.h"
#include "skl_watermark_regs.h"

2
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -33,6 +33,7 @@
#include <drm/display/drm_scdc_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_privacy_screen_consumer.h>
#include <drm/intel/step.h>
#include "icl_dsi.h"
#include "intel_alpm.h"
@ -81,7 +82,6 @@
#include "intel_psr.h"
#include "intel_quirks.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "intel_tc.h"
#include "intel_vdsc.h"
#include "intel_vdsc_regs.h"

2
drivers/gpu/drm/i915/display/intel_display_device.c
View File

@ -9,6 +9,7 @@
#include <drm/drm_drv.h>
#include <drm/drm_print.h>
#include <drm/intel/pciids.h>
#include <drm/intel/step.h>
#include "intel_cx0_phy_regs.h"
#include "intel_de.h"
@ -21,7 +22,6 @@
#include "intel_display_types.h"
#include "intel_display_wa.h"
#include "intel_fbc.h"
#include "intel_step.h"
__diag_push();
__diag_ignore_all("-Woverride-init", "Allow field initialization overrides for display info");

2
drivers/gpu/drm/i915/display/intel_display_power.c
View File

@ -8,6 +8,7 @@
#include <drm/drm_print.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "intel_backlight_regs.h"
#include "intel_cdclk.h"
@ -30,7 +31,6 @@
#include "intel_pmdemand.h"
#include "intel_pps_regs.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "skl_watermark.h"
#include "skl_watermark_regs.h"
#include "vlv_sideband.h"

2
drivers/gpu/drm/i915/display/intel_display_wa.c
View File

@ -4,12 +4,12 @@
*/
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_de.h"
#include "intel_display_core.h"
#include "intel_display_regs.h"
#include "intel_display_wa.h"
#include "intel_step.h"
static void gen11_display_wa_apply(struct intel_display *display)
{

2
drivers/gpu/drm/i915/display/intel_dp_mst.c
View File

@ -32,6 +32,7 @@
#include <drm/drm_fixed.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
#include <drm/intel/step.h>
#include "intel_atomic.h"
#include "intel_audio.h"
@ -56,7 +57,6 @@
#include "intel_link_bw.h"
#include "intel_pfit.h"
#include "intel_psr.h"
#include "intel_step.h"
#include "intel_vdsc.h"
#include "intel_vrr.h"
#include "skl_scaler.h"

2
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
View File

@ -25,6 +25,7 @@
#include <linux/string_helpers.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "bxt_dpio_phy_regs.h"
#include "intel_cx0_phy.h"
@ -41,7 +42,6 @@
#include "intel_lt_phy.h"
#include "intel_mg_phy_regs.h"
#include "intel_pch_refclk.h"
#include "intel_step.h"
#include "intel_tc.h"
/**

2
drivers/gpu/drm/i915/display/intel_fbc.c
View File

@ -44,6 +44,7 @@
#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "i9xx_plane_regs.h"
#include "intel_de.h"
@ -58,7 +59,6 @@
#include "intel_fbc_regs.h"
#include "intel_frontbuffer.h"
#include "intel_parent.h"
#include "intel_step.h"
#define for_each_fbc_id(__display, __fbc_id) \
for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \

2
drivers/gpu/drm/i915/display/intel_flipq.c
View File

@ -6,6 +6,7 @@
#include <linux/pci.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_crtc.h"
#include "intel_de.h"
@ -17,7 +18,6 @@
#include "intel_dmc_regs.h"
#include "intel_dsb.h"
#include "intel_flipq.h"
#include "intel_step.h"
#include "intel_vblank.h"
#include "intel_vrr.h"

2
drivers/gpu/drm/i915/display/intel_hdcp.c
View File

@ -18,6 +18,7 @@
#include <drm/drm_print.h>
#include <drm/intel/i915_component.h>
#include <drm/intel/intel_pcode_regs.h>
#include <drm/intel/step.h>
#include "intel_connector.h"
#include "intel_de.h"
@ -33,7 +34,6 @@
#include "intel_hdcp_regs.h"
#include "intel_hdcp_shim.h"
#include "intel_parent.h"
#include "intel_step.h"
#define USE_HDCP_GSC(__display) (DISPLAY_VER(__display) >= 14)

2
drivers/gpu/drm/i915/display/intel_pmdemand.c
View File

@ -6,6 +6,7 @@
#include <linux/bitops.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_atomic.h"
#include "intel_bw.h"
@ -17,7 +18,6 @@
#include "intel_display_utils.h"
#include "intel_display_wa.h"
#include "intel_pmdemand.h"
#include "intel_step.h"
#include "skl_watermark.h"
struct pmdemand_params {

2
drivers/gpu/drm/i915/display/intel_psr.c
View File

@ -28,6 +28,7 @@
#include <drm/drm_debugfs.h>
#include <drm/drm_print.h>
#include <drm/drm_vblank.h>
#include <drm/intel/step.h>
#include "intel_alpm.h"
#include "intel_atomic.h"
@ -51,7 +52,6 @@
#include "intel_psr_regs.h"
#include "intel_quirks.h"
#include "intel_snps_phy.h"
#include "intel_step.h"
#include "intel_vblank.h"
#include "intel_vdsc.h"
#include "intel_vrr.h"

2
drivers/gpu/drm/i915/display/skl_universal_plane.c
View File

@ -8,6 +8,7 @@
#include <drm/drm_damage_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_print.h>
#include <drm/intel/step.h>
#include "intel_bo.h"
#include "intel_color.h"
@ -25,7 +26,6 @@
#include "intel_plane.h"
#include "intel_psr.h"
#include "intel_psr_regs.h"
#include "intel_step.h"
#include "skl_scaler.h"
#include "skl_universal_plane.h"
#include "skl_universal_plane_regs.h"

13
drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
View File

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2023 Intel Corporation
*/
#ifndef __INTEL_STEP_H__
#define __INTEL_STEP_H__
#include "xe_step_types.h"
#define intel_step xe_step
#endif /* __INTEL_STEP_H__ */

4
drivers/gpu/drm/xe/tests/xe_pci.c
View File

@ -131,12 +131,12 @@ static const char *subplatform_prefix(enum xe_subplatform s)
return s == XE_SUBPLATFORM_NONE ? "" : " ";
}
static const char *step_prefix(enum xe_step step)
static const char *step_prefix(enum intel_step step)
{
return step == STEP_NONE ? "" : " ";
}
static const char *step_name(enum xe_step step)
static const char *step_name(enum intel_step step)
{
return step == STEP_NONE ? "" : xe_step_name(step);
}

2
drivers/gpu/drm/xe/xe_step.c
View File

@ -278,7 +278,7 @@ void xe_step_gmdid_get(struct xe_device *xe,
case STEP_##name: \
return #name;
const char *xe_step_name(enum xe_step step)
const char *xe_step_name(enum intel_step step)
{
switch (step) {
STEP_NAME_LIST(STEP_NAME_CASE);

4
drivers/gpu/drm/xe/xe_step.h
View File

@ -18,8 +18,8 @@ void xe_step_pre_gmdid_get(struct xe_device *xe);
void xe_step_gmdid_get(struct xe_device *xe,
u32 graphics_gmdid_revid,
u32 media_gmdid_revid);
static inline u32 xe_step_to_gmdid(enum xe_step step) { return step - STEP_A0; }
static inline u32 xe_step_to_gmdid(enum intel_step step) { return step - STEP_A0; }
const char *xe_step_name(enum xe_step step);
const char *xe_step_name(enum intel_step step);
#endif

61
drivers/gpu/drm/xe/xe_step_types.h
View File

@ -8,6 +8,8 @@
#include <linux/types.h>
#include <drm/intel/step.h>
struct xe_step_info {
u8 platform;
u8 graphics;
@ -15,63 +17,4 @@ struct xe_step_info {
u8 basedie;
};
#define STEP_ENUM_VAL(name) STEP_##name,
/*
* Always define four minor steppings 0-3 for each stepping to match GMD ID
* spacing of values. See xe_step_gmdid_get().
*/
#define STEP_NAME_LIST(func) \
func(A0) \
func(A1) \
func(A2) \
func(A3) \
func(B0) \
func(B1) \
func(B2) \
func(B3) \
func(C0) \
func(C1) \
func(C2) \
func(C3) \
func(D0) \
func(D1) \
func(D2) \
func(D3) \
func(E0) \
func(E1) \
func(E2) \
func(E3) \
func(F0) \
func(F1) \
func(F2) \
func(F3) \
func(G0) \
func(G1) \
func(G2) \
func(G3) \
func(H0) \
func(H1) \
func(H2) \
func(H3) \
func(I0) \
func(I1) \
func(I2) \
func(I3) \
func(J0) \
func(J1) \
func(J2) \
func(J3)
/*
* Symbolic steppings that do not match the hardware. These are valid both as gt
* and display steppings as symbolic names.
*/
enum xe_step {
STEP_NONE = 0,
STEP_NAME_LIST(STEP_ENUM_VAL)
STEP_FUTURE,
STEP_FOREVER,
};
#endif