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 28962C4828F for ; Fri, 2 Feb 2024 22:50:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6D6F10F133; Fri, 2 Feb 2024 22:50:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ugztt7wx"; dkim-atps=neutral X-Greylist: delayed 425 seconds by postgrey-1.36 at gabe; Fri, 02 Feb 2024 22:50:49 UTC Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8A1910F131 for ; Fri, 2 Feb 2024 22:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706914250; x=1738450250; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cJWn7qLBRIL75r5nIki4tHXyuEgZb3MWKk58f0OAVs8=; b=Ugztt7wxzAkx+endhIEJtqOFiNmvuhD8hMv0x4hVldLMA7UIQs1uM8Tc DjnCnM0PiBe4O9QviS8+HYDbH6rHeXpuIbOZG4khXKtJw2j5fnFuF/yfs +JMGk71V7AcYLzHcAdiqCcj+EAK2nMJO61v7guUMj1+BeSriUQQcmYu+C qyk4KdZPlzPjO8PLu4bcOp5xWhmeh8inAmhuyIhNTC4k+EtEiKDp1OYh0 UwGSYA9cM8nAMPjOKwrERuvXA4Y4jV6zhzYGtNh5Y4uvnBAJBxx7aPgCx DWtjI+vZxS3opaMVjscnnW1HTPXnySUixjFE5xb5zJHiGmh76YxD+mvmw Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="153703" X-IronPort-AV: E=Sophos;i="6.05,238,1701158400"; d="scan'208";a="153703" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2024 14:43:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="823331991" X-IronPort-AV: E=Sophos;i="6.05,238,1701158400"; d="scan'208";a="823331991" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga001.jf.intel.com with SMTP; 02 Feb 2024 14:43:40 -0800 Received: by stinkbox (sSMTP sendmail emulation); Sat, 03 Feb 2024 00:43:40 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, Paz Zcharya Subject: [PATCH v4 00/16] drm/i915: (stolen) memory region related fixes Date: Sat, 3 Feb 2024 00:43:24 +0200 Message-ID: <20240202224340.30647-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: Ville Syrjälä Attempt to fix the mess around stolen memory, especially on MTL with it's special (and apparenly broken) not-actually-lmem stolen. The series is made up of roughtly three parts: 1. General refactoring/debug improvement for mem regions 2. Deal with the broken BAR stuff on MTL 3. Fix initial display plane readout for MTL v2: Try to relocate the BIOS fb to start of ggtt to make space for the GuC stuff at the top end of ggtt v3: Skip ton VM guests as they won't have access to stolen directly Annotate more initial fb takeover failure paths Add the w/a numbers v4: Check the magic pcode bit Try to deal with xe fallout Cc: Paz Zcharya Ville Syrjälä (16): drm/i915: Use struct resource for memory region IO as well drm/i915: Print memory region info during probe drm/i915: Remove ad-hoc lmem/stolen debugs drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access drm/i915: Disable the "binder" drm/i915: Rename the DSM/GSM registers drm/i915: Fix PTE decode during initial plane readout drm/i915: Fix region start during initial plane readout drm/i915: Fix MTL initial plane readout drm/i915: s/phys_base/dma_addr/ drm/i915: Split the smem and lmem plane readout apart drm/i915: Simplify intel_initial_plane_config() calling convention drm/i915/fbdev: Fix smem_start for LMEMBAR stolen objects drm/i915: Tweak BIOS fb reuse check drm/i915: Try to relocate the BIOS fb to the start of ggtt drm/i915: Annotate more of the BIOS fb takeover failure paths drivers/gpu/drm/i915/display/i9xx_plane.c | 30 +++ drivers/gpu/drm/i915/display/i9xx_plane.h | 7 + drivers/gpu/drm/i915/display/intel_display.c | 5 + .../gpu/drm/i915/display/intel_display_core.h | 2 + .../drm/i915/display/intel_display_driver.c | 7 +- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 5 +- .../drm/i915/display/intel_plane_initial.c | 255 +++++++++++++----- .../drm/i915/display/intel_plane_initial.h | 4 +- .../drm/i915/display/skl_universal_plane.c | 28 ++ .../drm/i915/display/skl_universal_plane.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 25 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 8 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 18 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 10 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 3 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 14 +- drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_query.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 10 +- drivers/gpu/drm/i915/i915_utils.c | 17 ++ drivers/gpu/drm/i915/i915_utils.h | 2 + drivers/gpu/drm/i915/intel_memory_region.c | 33 ++- drivers/gpu/drm/i915/intel_memory_region.h | 3 +- drivers/gpu/drm/i915/intel_region_ttm.c | 8 +- .../drm/i915/selftests/intel_memory_region.c | 4 +- drivers/gpu/drm/xe/display/xe_plane_initial.c | 67 +++-- 29 files changed, 412 insertions(+), 167 deletions(-) -- 2.43.0