From patchwork Thu Feb 14 14:56:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 10812891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 643F913B5 for ; Thu, 14 Feb 2019 14:57:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52C3A2E900 for ; Thu, 14 Feb 2019 14:57:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 471962E907; Thu, 14 Feb 2019 14:57:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8B922E900 for ; Thu, 14 Feb 2019 14:57:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2724A6E907; Thu, 14 Feb 2019 14:57:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B01666E907 for ; Thu, 14 Feb 2019 14:57:42 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2019 06:57:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,369,1544515200"; d="scan'208";a="114920410" Received: from jhbrinke-mobl3.amr.corp.intel.com (HELO mwahaha.ger.corp.intel.com) ([10.252.11.151]) by orsmga007.jf.intel.com with ESMTP; 14 Feb 2019 06:57:41 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Thu, 14 Feb 2019 14:56:58 +0000 Message-Id: <20190214145740.14521-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Intel-gfx] [RFC PATCH 00/42] Introduce memory region concept (including device local memory) X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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" X-Virus-Scanned: ClamAV using ClamSMTP In preparation for upcoming devices with device local memory, introduce the concept of different memory regions, and a simple buddy allocator to manage them. At the end of the series are a couple of HAX patches which introduce a fake local memory region for testing purposes. Currently smoke tested on a Skull Canyon device. Abdiel Janulgue (13): drm/i915: Add memory region information to device_info drm/i915/lmem: add helper to get CPU visible pfn drm/i915/lmem: support kernel mapping drm/i915: Split out GTT fault handler to make it generic drm/i915: Set correct vmf source pages for gem objects drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET drm/i915: cpu-map based dumb buffers drm/i915: Add fill_pages handler for dma_buf imported objects UPSTREAM: drm/i915/query: Split out query item checks drm/i915/query: Expose memory regions through the query uAPI drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION drm/i915: enumerate and init each supported region drm/i915: setup io-mapping for LMEM Daniele Ceraolo Spurio (5): drm/i915: define HAS_MAPPABLE_APERTURE drm/i915: do not map aperture if it is not available. drm/i915: expose missing map_gtt support to users drm/i915: set num_fence_regs to 0 if there is no aperture drm/i915: error capture with no ggtt slot Matthew Auld (23): drm/i915: support 1G pages for the 48b PPGTT drm/i915: enable platform support for 1G pages drm/i915: buddy allocator drm/i915: introduce intel_memory_region drm/i915/region: support basic eviction drm/i915/region: support continuous allocations drm/i915/region: support volatile objects drm/i915: support creating LMEM objects drm/i915/selftests: exercise writes to LMEM drm/i915/selftests: exercise huge-pages for LMEM drm/i915: support object clearing via blitter engine drm/i915: introduce kernel blitter_context drm/i915: support copying objects via blitter engine drm/i915: support basic object migration drm/i915/lmem: support CPU relocations drm/i915: add vfunc for pread drm/i915/lmem: support pread drm/i915/lmem: support pwrite drm/i915/lmem: include debugfs metrics drm/i915: treat shmem as a region drm/i915: treat stolen as a region HAX drm/i915: add the fake lmem region HAX drm/i915/lmem: default userspace allocations to LMEM Michal Wajdeczko (1): drm/i915: Don't try to place HWS in non-existing mappable region arch/x86/kernel/early-quirks.c | 26 + drivers/gpu/drm/i915/Makefile | 3 + drivers/gpu/drm/i915/i915_debugfs.c | 31 + drivers/gpu/drm/i915/i915_drv.c | 19 +- drivers/gpu/drm/i915/i915_drv.h | 37 +- drivers/gpu/drm/i915/i915_gem.c | 1005 +++++++++++++++-- drivers/gpu/drm/i915/i915_gem_buddy.c | 206 ++++ drivers/gpu/drm/i915/i915_gem_buddy.h | 118 ++ drivers/gpu/drm/i915/i915_gem_context.c | 13 + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 14 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 67 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 136 ++- drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +- drivers/gpu/drm/i915/i915_gem_object.c | 1 + drivers/gpu/drm/i915/i915_gem_object.h | 43 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 59 + drivers/gpu/drm/i915/i915_gem_stolen.c | 66 +- drivers/gpu/drm/i915/i915_gpu_error.c | 63 +- drivers/gpu/drm/i915/i915_pci.c | 18 +- drivers/gpu/drm/i915/i915_query.c | 97 +- drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_gpu_commands.h | 3 + drivers/gpu/drm/i915/intel_memory_region.c | 286 +++++ drivers/gpu/drm/i915/intel_memory_region.h | 140 +++ drivers/gpu/drm/i915/intel_region_lmem.c | 388 +++++++ drivers/gpu/drm/i915/intel_region_lmem.h | 46 + drivers/gpu/drm/i915/selftests/huge_pages.c | 204 +++- .../gpu/drm/i915/selftests/i915_gem_buddy.c | 209 ++++ .../gpu/drm/i915/selftests/i915_gem_object.c | 150 +++ .../drm/i915/selftests/i915_live_selftests.h | 1 + .../drm/i915/selftests/i915_mock_selftests.h | 2 + .../drm/i915/selftests/intel_memory_region.c | 911 +++++++++++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 8 +- drivers/gpu/drm/i915/selftests/mock_region.c | 75 ++ drivers/gpu/drm/i915/selftests/mock_region.h | 35 + include/drm/i915_drm.h | 3 + include/uapi/drm/i915_drm.h | 94 +- 38 files changed, 4396 insertions(+), 188 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_buddy.c create mode 100644 drivers/gpu/drm/i915/i915_gem_buddy.h create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_buddy.c create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h