From patchwork Tue Jan 16 07:56:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13520529 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 B26CFC47077 for ; Tue, 16 Jan 2024 07:56:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DCF010E3FE; Tue, 16 Jan 2024 07:56:42 +0000 (UTC) Received: from mgamail.intel.com (unknown [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4122A10E3FE for ; Tue, 16 Jan 2024 07:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705391801; x=1736927801; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ZQCnwub7euf7WwvFA4oS4zTgfn6EDhkNTHwqWTPI+Ik=; b=BroigvuBdNm2vZtkFPW7p8w/wqKqpism1qix1K/h2e7jAX0HnzOwZfop viJq4g51B/xknpMBe50GktlMo0cMagrcLlwC16sFuFk+jLf1n+iaXfPoa 55VvDEH773Jpi3/74/NgV3DQX+LBqevCf9Qj6K+qS2tLr3updk+WpumYN u2eaq/u5kuc9EDJWuUElgcnlCbU06YLiA+zIOiVBn5XRcINB54Pt9oh2z pVlBS93EwG0iesaiIWl5gzJUMaRXNb7AMgb9pulPmOfwnTOtFpjXKgwD7 ku9rcSYBNyaVQMnV5QqQpkmutOPYXMtUa9rRYr4QbmRJU5bcSxIXfX29z g==; X-IronPort-AV: E=McAfee;i="6600,9927,10954"; a="430948452" X-IronPort-AV: E=Sophos;i="6.04,198,1695711600"; d="scan'208";a="430948452" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2024 23:56:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10954"; a="776946954" X-IronPort-AV: E=Sophos;i="6.04,198,1695711600"; d="scan'208";a="776946954" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 15 Jan 2024 23:56:37 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 16 Jan 2024 09:56:36 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH v3 00/16] drm/i915: (stolen) memory region related fixes Date: Tue, 16 Jan 2024 09:56:20 +0200 Message-ID: <20240116075636.6121-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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" 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 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 | 257 +++++++++++++----- .../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 | 33 ++- 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 | 16 +- 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 | 7 +- 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 +- 26 files changed, 365 insertions(+), 141 deletions(-)