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 E99B6C7EE29 for ; Wed, 31 May 2023 22:48:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CAAAC10E1EF; Wed, 31 May 2023 22:48:41 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id D26FF10E0E7 for ; Wed, 31 May 2023 22:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685573310; x=1717109310; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=re+DoCGJy3Ig/4cTcy5wVktP3sJmdOywQCKxQ91/MSs=; b=mWT0Yq/iK6iMIJrjmsMr6Nc3Zr6oSwebnllkzfgEhDE16Y7BpsUNYz3Y FF9e31yo5R7SJ3/8Mtjrei4AeUkCzIHepc56XWaPPCe4mlizX7VasvPts yk0mWk5OViusrP90tOyP7TAlia8t29da1Ni2JNKF3pu07OosR5UTOL/0b La88ZMB9ZcWJF9AR49tY/eSvBDw63Rx6juotQAcNc52aKfKA3We5+GC3r tSIhPnLPd31SGr5k2Tdr+nFXfo4dv8ahBt0aPL0WSiBTOMqJxXOw7Ci5y EvOJ/lC6XcQRG91TQfVNeqaw77lfk7frEf3OuzJcYn98VQeRj0kXQoa52 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10727"; a="354235483" X-IronPort-AV: E=Sophos;i="6.00,207,1681196400"; d="scan'208";a="354235483" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2023 15:48:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10727"; a="1037229638" X-IronPort-AV: E=Sophos;i="6.00,207,1681196400"; d="scan'208";a="1037229638" Received: from mdroper-desk1.fm.intel.com ([10.1.27.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2023 15:48:29 -0700 From: Matt Roper To: intel-xe@lists.freedesktop.org Date: Wed, 31 May 2023 15:48:21 -0700 Message-Id: <20230531224821.387722-9-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531224821.387722-1-matthew.d.roper@intel.com> References: <20230531224821.387722-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 8/8] drm/xe/display: Call display probe from i915 code X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.d.roper@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" FIXME: These changes should have been a fixup patch against "drm/xe/display: Implement display support" but that commit has itself been mis-squashed somewhere and no longer exists. Signed-off-by: Matt Roper --- drivers/gpu/drm/xe/Makefile | 2 + .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 40 +---- .../drm/xe/display/ext/intel_device_info.c | 60 ++++--- drivers/gpu/drm/xe/xe_device_types.h | 56 +----- drivers/gpu/drm/xe/xe_display.c | 164 +++--------------- 5 files changed, 75 insertions(+), 247 deletions(-) diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index da1e447c08c7..ebab5385f636 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -121,6 +121,7 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ -Ddrm_i915_private=xe_device CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init) +CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init) # Rule to build display code shared with i915 $(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE @@ -160,6 +161,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-display/intel_ddi.o \ i915-display/intel_ddi_buf_trans.o \ i915-display/intel_display.o \ + i915-display/intel_display_device.o \ i915-display/intel_display_driver.o \ i915-display/intel_display_debugfs.o \ i915-display/intel_display_power.o \ diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h index 74e6f063f741..949b40afbd57 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -84,44 +84,14 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) #define IS_BDW_ULT(dev_priv) (dev_priv && 0) #define IS_BDW_ULX(dev_priv) (dev_priv && 0) -#define INTEL_NUM_PIPES(xe) (hweight8((xe)->info.display.pipe_mask)) -#define HAS_DISPLAY(xe) ((xe)->info.display.pipe_mask != 0) #define INTEL_DISPLAY_ENABLED(xe) (HAS_DISPLAY((xe)) && !intel_opregion_headless_sku((xe))) -#define HAS_CDCLK_CRAWL(xe) ((xe)->info.display.has_cdclk_crawl) -#define HAS_CDCLK_SQUASH(xe) ((xe)->info.display.has_cdclk_squash) -#define HAS_PSR(xe) ((xe)->info.display.has_psr) -#define HAS_PSR2_SEL_FETCH(xe) (xe || 1) -#define HAS_PSR_HW_TRACKING(xe) ((xe)->info.display.has_psr_hw_tracking) -#define HAS_IPC(xe) ((xe)->info.display.has_ipc) -#define HAS_IPS(xe) (xe && false) -#define HAS_SAGV(xe) (xe || 1) -#define HAS_DP_MST(xe) ((xe)->info.display.has_dp_mst) -#define HAS_DMC(xe) ((xe)->info.display.has_dmc) -#define HAS_DSB(xe) ((xe)->info.display.has_dsb) -#define HAS_DSC(xe) ((xe)->info.display.has_dsc) -#define HAS_CUR_FBC(xe) (xe || 1) -#define HAS_DOUBLE_BUFFERED_M_N(xe) ((xe) || 1) -#define I915_HAS_HOTPLUG(xe) (true) -#define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \ - IS_ALDERLAKE_S(dev_priv)) -#define DISPLAY_VER(xe) ((xe)->info.display.ver) +#define DISPLAY_VER(xe) ((xe)->info.display_runtime.ip.ver) #define IS_DISPLAY_VER(xe, first, last) ((DISPLAY_VER(xe) >= first && DISPLAY_VER(xe) <= last)) #define IS_GRAPHICS_VER(xe, first, last) \ ((xe)->info.graphics_verx100 >= first * 100 && \ (xe)->info.graphics_verx100 <= (last*100 + 99)) #define IS_MOBILE(xe) (xe && 0) -#define HAS_GMCH(xe) (xe && 0) -#define HAS_DDI(xe) (xe || 1) #define HAS_LLC(xe) (!IS_DGFX((xe))) -#define HAS_GMBUS_IRQ(xe) (xe || 1) -#define HAS_GMBUS_BURST_READ(xe) (xe || 1) -#define HAS_VRR(xe) (xe || 1) -#define HAS_ASYNC_FLIPS(xe) (xe || 1) -#define HAS_FBC(xe) ((xe)->info.display.fbc_mask) -#define SUPPORTS_TV(xe) (xe && 0) -#define HAS_MBUS_JOINING(xe) (xe && 0) -#define HAS_HW_SAGV_WM(xe) (DISPLAY_VER(xe) >= 13 && !IS_DGFX(xe)) -#define HAS_DPT(xe) (DISPLAY_VER(xe) >= 13) /* Workarounds not handled yet */ #define IS_DISPLAY_STEP(xe, first, last) ({u8 __step = (xe)->info.step.display; first <= __step && __step <= last;}) @@ -162,15 +132,11 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) #define IS_DG2_G12(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G12) #define IS_ADLP_RPLU(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_ADLP_RPLU) #define IS_ICL_WITH_PORT_F(xe) (xe && 0) -#define HAS_LSPCON(xe) (xe && 0) -#define HAS_MSO(xe) (xe || 1) -#define HAS_DP20(xe) (IS_DG2(xe)) #define HAS_FLAT_CCS(xe) (xe_device_has_flat_ccs(xe)) #define HAS_4TILE(xe) ((xe)->info.has_4tile) #define to_intel_bo(x) gem_to_xe_bo((x)) #define mkwrite_device_info(xe) (INTEL_INFO(xe)) -#define HAS_TRANSCODER(dev_priv, trans) ((INTEL_INFO(dev_priv)->display.cpu_transcoder_mask & BIT(trans)) != 0) #define HAS_128_BYTE_Y_TILING(xe) (xe || 1) #define intel_has_gpu_reset(a) (a && 0) @@ -225,7 +191,9 @@ static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, bool wakeref) #define intel_step_name xe_step_name #define pdev_to_i915 pdev_to_xe_device -#define RUNTIME_INFO(xe) (&(xe)->info.display) +#define DISPLAY_INFO(xe) ((xe)->info.display) +#define RUNTIME_INFO(xe) (&(xe)->info.i915_runtime) +#define DISPLAY_RUNTIME_INFO(xe) (&(xe)->info.display_runtime) #define FORCEWAKE_ALL XE_FORCEWAKE_ALL #define HPD_STORM_DEFAULT_THRESHOLD 50 diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.c b/drivers/gpu/drm/xe/display/ext/intel_device_info.c index 9a54611037b5..4e304961d45f 100644 --- a/drivers/gpu/drm/xe/display/ext/intel_device_info.c +++ b/drivers/gpu/drm/xe/display/ext/intel_device_info.c @@ -48,69 +48,70 @@ */ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) { - struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv); + struct intel_display_runtime_info *display_runtime = + DISPLAY_RUNTIME_INFO(dev_priv); enum pipe pipe; /* Wa_14011765242: adl-s A0,A1 */ if (IS_ADLS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A2)) { for_each_pipe(dev_priv, pipe) - runtime->num_scalers[pipe] = 0; + display_runtime->num_scalers[pipe] = 0; } else if (DISPLAY_VER(dev_priv) >= 11) { for_each_pipe(dev_priv, pipe) - runtime->num_scalers[pipe] = 2; + display_runtime->num_scalers[pipe] = 2; } else if (DISPLAY_VER(dev_priv) >= 9) { - runtime->num_scalers[PIPE_A] = 2; - runtime->num_scalers[PIPE_B] = 2; - runtime->num_scalers[PIPE_C] = 1; + display_runtime->num_scalers[PIPE_A] = 2; + display_runtime->num_scalers[PIPE_B] = 2; + display_runtime->num_scalers[PIPE_C] = 1; } if (DISPLAY_VER(dev_priv) >= 13 || HAS_D12_PLANE_MINIMIZATION(dev_priv)) { for_each_pipe(dev_priv, pipe) - runtime->num_sprites[pipe] = 4; + display_runtime->num_sprites[pipe] = 4; } else if (DISPLAY_VER(dev_priv) >= 11) { for_each_pipe(dev_priv, pipe) - runtime->num_sprites[pipe] = 6; + display_runtime->num_sprites[pipe] = 6; } if (HAS_DISPLAY(dev_priv) && DISPLAY_VER(dev_priv) >= 9) { u32 dfsm = intel_de_read(dev_priv, SKL_DFSM); if (dfsm & SKL_DFSM_PIPE_A_DISABLE) { - runtime->pipe_mask &= ~BIT(PIPE_A); - runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_A); - runtime->fbc_mask &= ~BIT(INTEL_FBC_A); + display_runtime->pipe_mask &= ~BIT(PIPE_A); + display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_A); + display_runtime->fbc_mask &= ~BIT(INTEL_FBC_A); } if (dfsm & SKL_DFSM_PIPE_B_DISABLE) { - runtime->pipe_mask &= ~BIT(PIPE_B); - runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_B); + display_runtime->pipe_mask &= ~BIT(PIPE_B); + display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_B); } if (dfsm & SKL_DFSM_PIPE_C_DISABLE) { - runtime->pipe_mask &= ~BIT(PIPE_C); - runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_C); + display_runtime->pipe_mask &= ~BIT(PIPE_C); + display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_C); } if (DISPLAY_VER(dev_priv) >= 12 && (dfsm & TGL_DFSM_PIPE_D_DISABLE)) { - runtime->pipe_mask &= ~BIT(PIPE_D); - runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_D); + display_runtime->pipe_mask &= ~BIT(PIPE_D); + display_runtime->cpu_transcoder_mask &= ~BIT(TRANSCODER_D); } if (dfsm & SKL_DFSM_DISPLAY_HDCP_DISABLE) - runtime->has_hdcp = 0; + display_runtime->has_hdcp = 0; if (dfsm & SKL_DFSM_DISPLAY_PM_DISABLE) - runtime->fbc_mask = 0; + display_runtime->fbc_mask = 0; if (DISPLAY_VER(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE)) - runtime->has_dmc = 0; + display_runtime->has_dmc = 0; - if (DISPLAY_VER(dev_priv) >= 10 && + if (IS_DISPLAY_VER(dev_priv, 10, 12) && (dfsm & GLK_DFSM_DISPLAY_DSC_DISABLE)) - runtime->has_dsc = 0; + display_runtime->has_dsc = 0; } - runtime->rawclk_freq = intel_read_rawclk(dev_priv); - drm_dbg(&dev_priv->drm, "rawclk rate: %d kHz\n", runtime->rawclk_freq); + RUNTIME_INFO(dev_priv)->rawclk_freq = intel_read_rawclk(dev_priv); + drm_dbg(&dev_priv->drm, "rawclk rate: %d kHz\n", RUNTIME_INFO(dev_priv)->rawclk_freq); } bool i915_vtd_active(struct drm_i915_private *i915) @@ -128,3 +129,14 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err, { return 0; } +int i8xx_enable_vblank(struct drm_crtc *crtc) { return 0; } +void intel_dvo_init(struct drm_i915_private *i915) {} +int i965_enable_vblank(struct drm_crtc *crtc) { return 0; } +int intel_tv_init(struct drm_i915_private *i915) { return 0; } +int assert_dsi_pll_enabled(struct drm_i915_private *i915) { return 0; } +bool intel_sdvo_init(struct drm_i915_private *dev_priv, + i915_reg_t sdvo_reg, enum port port) { return false; } +void i965_disable_vblank(struct drm_crtc *crtc) {} +void i8xx_disable_vblank(struct drm_crtc *crtc) {} +void g4x_hdmi_init(struct drm_i915_private *dev_priv, + i915_reg_t hdmi_reg, enum port port) {} diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 51c16d207780..27a312bb7a63 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -21,6 +21,7 @@ #include "ext/intel_device_info.h" #include "ext/intel_pch.h" #include "intel_display_core.h" +#include "intel_display_device.h" #endif #define XE_BO_INVALID_OFFSET LONG_MAX @@ -112,58 +113,11 @@ struct xe_device { u8 enable_display:1; #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) - struct xe_device_display_info { - u8 ver; - - u8 pipe_mask; - u8 cpu_transcoder_mask; - u8 fbc_mask; - u8 abox_mask; - - struct { - u16 size; /* in blocks */ - u8 slice_mask; - } dbuf; - -#define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \ - /* Keep in alphabetical order */ \ - func(has_cdclk_crawl); \ - func(has_cdclk_squash); \ - func(has_dmc); \ - func(has_dp_mst); \ - func(has_dsb); \ - func(has_dsc); \ - func(has_fpga_dbg); \ - func(has_hdcp); \ - func(has_hti); \ - func(has_ipc); \ - func(has_psr); \ - func(has_psr_hw_tracking); - -#define DEFINE_FLAG(name) u8 name:1 - DEV_INFO_DISPLAY_FOR_EACH_FLAG(DEFINE_FLAG); -#undef DEFINE_FLAG - - /* Register offsets for the various display pipes and transcoders */ - u32 pipe_offsets[I915_MAX_TRANSCODERS]; - u32 trans_offsets[I915_MAX_TRANSCODERS]; - u32 cursor_offsets[I915_MAX_PIPES]; - - struct { - u32 degamma_lut_size; - u32 gamma_lut_size; - u32 degamma_lut_tests; - u32 gamma_lut_tests; - } color; - - /* Populated by intel_device_runtime_init() */ - u8 num_sprites[I915_MAX_PIPES]; - u8 num_scalers[I915_MAX_PIPES]; + const struct intel_display_device_info *display; + struct intel_display_runtime_info display_runtime; + struct { u32 rawclk_freq; - - /* Unused by xe, but for compat */ - u32 mmio_offset; - } display; + } i915_runtime; #endif } info; diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c index 1a9e9c78966d..17dacd06954d 100644 --- a/drivers/gpu/drm/xe/xe_display.c +++ b/drivers/gpu/drm/xe/xe_display.c @@ -320,7 +320,7 @@ static void intel_suspend_encoders(struct xe_device *xe) struct drm_device *dev = &xe->drm; struct intel_encoder *encoder; - if (!xe->info.display.pipe_mask) + if (xe->info.display_runtime.pipe_mask) return; drm_modeset_lock_all(dev); @@ -340,7 +340,7 @@ void xe_display_pm_suspend(struct xe_device *xe) * properly. */ intel_power_domains_disable(xe); - if (xe->info.display.pipe_mask) + if (xe->info.display_runtime.pipe_mask) drm_kms_helper_poll_disable(&xe->drm); intel_display_driver_suspend(xe); @@ -385,7 +385,7 @@ void xe_display_pm_resume(struct xe_device *xe) intel_dmc_resume(xe); - if (xe->info.display.pipe_mask) + if (xe->info.display_runtime.pipe_mask) drm_mode_config_reset(&xe->drm); intel_display_driver_init_hw(xe); @@ -397,7 +397,7 @@ void xe_display_pm_resume(struct xe_device *xe) intel_display_driver_resume(xe); intel_hpd_poll_disable(xe); - if (xe->info.display.pipe_mask) + if (xe->info.display_runtime.pipe_mask) drm_kms_helper_poll_enable(&xe->drm); intel_opregion_resume(xe); @@ -411,142 +411,34 @@ void xe_display_pm_resume(struct xe_device *xe) __diag_push(); __diag_ignore_all("-Woverride-init", "Allow field overrides in table"); -#define __DISPLAY_DEFAULTS \ - .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | \ - BIT(PIPE_C) | BIT(PIPE_D), \ - .cpu_transcoder_mask = \ - BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \ - BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ - .pipe_offsets = { \ - [TRANSCODER_A] = PIPE_A_OFFSET, \ - [TRANSCODER_B] = PIPE_B_OFFSET, \ - [TRANSCODER_C] = PIPE_C_OFFSET, \ - [TRANSCODER_D] = PIPE_D_OFFSET, \ - [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ - [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ - }, \ - .cursor_offsets = { \ - [PIPE_A] = CURSOR_A_OFFSET, \ - [PIPE_B] = CURSOR_B_OFFSET, \ - [PIPE_C] = CURSOR_C_OFFSET, \ - [PIPE_D] = CURSOR_D_OFFSET, \ - }, \ - .trans_offsets = { \ - [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ - [TRANSCODER_B] = TRANSCODER_B_OFFSET, \ - [TRANSCODER_C] = TRANSCODER_C_OFFSET, \ - [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ - [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ - [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ - } - -#define GEN12_DISPLAY \ - __DISPLAY_DEFAULTS, \ - .ver = 12, \ - .abox_mask = GENMASK(2, 1), \ - .has_dmc = 1, \ - .has_dp_mst = 1, \ - .has_dsb = 0, /* FIXME: LUT load is broken with huge DSB */ \ - .dbuf.size = 2048, \ - .dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2), \ - .has_dsc = 1, \ - .fbc_mask = BIT(INTEL_FBC_A), \ - .has_fpga_dbg = 1, \ - .has_hdcp = 1, \ - .has_ipc = 1, \ - .has_psr = 1, \ - .has_psr_hw_tracking = 0, \ - .color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 } - -#define XE_LPD \ - __DISPLAY_DEFAULTS, \ - .ver = 13, \ - .abox_mask = GENMASK(1, 0), \ - .color = { \ - .degamma_lut_size = 128, .gamma_lut_size = 1024, \ - .degamma_lut_tests = DRM_COLOR_LUT_NON_DECREASING | \ - DRM_COLOR_LUT_EQUAL_CHANNELS, \ - }, \ - .dbuf.size = 4096, \ - .dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) | \ - BIT(DBUF_S4), \ - .has_dmc = 1, \ - .has_dp_mst = 1, \ - .has_dsb = 1, \ - .has_dsc = 1, \ - .fbc_mask = BIT(INTEL_FBC_A), \ - .has_fpga_dbg = 1, \ - .has_hdcp = 1, \ - .has_ipc = 1, \ - .has_psr = 1, \ - .has_psr_hw_tracking = 0 - -#define XE_LPDP \ - XE_LPD, \ - .ver = 14, \ - .has_cdclk_crawl = 1, \ - .has_cdclk_squash = 1 - - void xe_display_info_init(struct xe_device *xe) { - if (!xe->info.enable_display) { - unset_display_features(xe); - return; - } + u16 gmdid_ver, gmdid_rel, gmdid_step; + bool has_gmdid = GRAPHICS_VERx100(xe) >= 1270; + + if (!xe->info.enable_display) + goto no_display; + + xe->info.display = intel_display_device_probe(xe, has_gmdid, &gmdid_ver, + &gmdid_rel, &gmdid_step); + memcpy(&xe->info.display_runtime, + &xe->info.display->__runtime_defaults, + sizeof(xe->info.display->__runtime_defaults)); - switch (xe->info.platform) { - case XE_TIGERLAKE: - case XE_DG1: - xe->info.display = (struct xe_device_display_info) { - GEN12_DISPLAY, - .has_psr_hw_tracking = 1, - }; - break; - case XE_ROCKETLAKE: - xe->info.display = (struct xe_device_display_info) { - GEN12_DISPLAY, - .abox_mask = BIT(0), - .has_hti = 1, - .cpu_transcoder_mask = - BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | - BIT(TRANSCODER_C), - .pipe_mask = - BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C), - }; - break; - case XE_ALDERLAKE_S: - xe->info.display = (struct xe_device_display_info) { - GEN12_DISPLAY, - .has_hti = 1, - }; - break; - case XE_ALDERLAKE_P: - case XE_ALDERLAKE_N: - xe->info.display = (struct xe_device_display_info) { - XE_LPD, - .has_cdclk_crawl = 1, - }; - break; - case XE_DG2: - xe->info.display = (struct xe_device_display_info) { - XE_LPD, - .cpu_transcoder_mask = - BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | - BIT(TRANSCODER_C) | BIT(TRANSCODER_D), - .has_cdclk_squash = 1, - }; - break; - case XE_METEORLAKE: - xe->info.display = (struct xe_device_display_info) { XE_LPDP }; - break; - default: - drm_warn(&xe->drm, "Unknown display IP\n"); - xe->info.enable_display = false; - unset_display_features(xe); - return; + if (!xe->info.display_runtime.pipe_mask) + goto no_display; + + if (has_gmdid) { + xe->info.display_runtime.ip.ver = gmdid_ver; + xe->info.display_runtime.ip.rel = gmdid_rel; + xe->info.display_runtime.ip.step = gmdid_step; } + + return; + +no_display: + xe->info.enable_display = false; + unset_display_features(xe); } __diag_pop(); -- 2.40.1