From patchwork Wed Jun 19 13:24:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 11004163 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 A1D15112C for ; Wed, 19 Jun 2019 13:25:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F3E028AB0 for ; Wed, 19 Jun 2019 13:25:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8336B28AA7; Wed, 19 Jun 2019 13:25:08 +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=-4.2 required=2.0 tests=BAYES_00,HK_RANDOM_FROM, 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 B4E7B28A9D for ; Wed, 19 Jun 2019 13:25:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F7306E3D2; Wed, 19 Jun 2019 13:25:05 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D43CB6E3D2 for ; Wed, 19 Jun 2019 13:25:03 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jun 2019 06:25:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,392,1557212400"; d="scan'208";a="153806326" Received: from yyosef-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.23.42]) by orsmga008.jf.intel.com with ESMTP; 19 Jun 2019 06:25:01 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 19 Jun 2019 14:24:26 +0100 Message-Id: <20190619132459.25351-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v7 00/33] Implicit dev_priv removal and GT compartmentalization 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 From: Tvrtko Ursulin Rebase + a couple fixes for mock tests. Some patches need r-b and/or r-b upgrades. Tvrtko Ursulin (33): drm/i915: Convert intel_vgt_(de)balloon to uncore drm/i915: Introduce struct intel_gt as replacement for anonymous i915->gt drm/i915: Move intel_gt initialization to a separate file drm/i915: Store some backpointers in struct intel_gt drm/i915: Move intel_gt_pm_init under intel_gt_init_early drm/i915: Make i915_check_and_clear_faults take intel_gt drm/i915: Convert i915_gem_init_swizzling to intel_gt drm/i915: Use intel_uncore_rmw in intel_gt_init_swizzling drm/i915: Convert init_unused_rings to intel_gt drm/i915: Convert gt workarounds to intel_gt drm/i915: Store backpointer to intel_gt in the engine drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt drm/i915: Convert i915_ppgtt_init_hw to intel_gt drm/i915: Consolidate some open coded mmio rmw drm/i915: Convert i915_gem_init_hw to intel_gt drm/i915: Move intel_engines_resume into common init drm/i915: Stop using I915_READ/WRITE in intel_wopcm_init_hw drm/i915: Compartmentalize i915_ggtt_probe_hw drm/i915: Compartmentalize i915_ggtt_init_hw drm/i915: Make ggtt invalidation work on ggtt drm/i915: Store intel_gt backpointer in vm drm/i915: Compartmentalize i915_gem_suspend/restore_gtt_mappings drm/i915: Convert i915_gem_flush_ggtt_writes to intel_gt drm/i915: Move i915_gem_chipset_flush to intel_gt drm/i915: Compartmentalize timeline_init/park/fini drm/i915: Compartmentalize i915_ggtt_cleanup_hw drm/i915: Compartmentalize i915_gem_init_ggtt drm/i915: Store ggtt pointer in intel_gt drm/i915: Compartmentalize ring buffer creation drm/i915: Save trip via top-level i915 in a few more places drm/i915: Make timelines gt centric drm/i915: Rename i915_timeline to intel_timeline and move under gt drm/i915: Eliminate dual personality of i915_scratch_offset drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/Makefile.header-test | 1 - drivers/gpu/drm/i915/gem/i915_gem_context.c | 10 +- .../gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 7 +- .../drm/i915/gem/selftests/i915_gem_context.c | 3 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine.h | 4 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 23 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 6 +- drivers/gpu/drm/i915/gt/intel_gt.c | 243 ++++++++++++ drivers/gpu/drm/i915/gt/intel_gt.h | 33 ++ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +- drivers/gpu/drm/i915/gt/intel_gt_pm.h | 3 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 61 +++ drivers/gpu/drm/i915/gt/intel_lrc.c | 26 +- drivers/gpu/drm/i915/gt/intel_mocs.c | 52 ++- drivers/gpu/drm/i915/gt/intel_mocs.h | 3 +- drivers/gpu/drm/i915/gt/intel_reset.c | 128 +----- drivers/gpu/drm/i915/gt/intel_reset.h | 2 - drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 64 +-- .../{i915_timeline.c => gt/intel_timeline.c} | 204 +++++----- drivers/gpu/drm/i915/gt/intel_timeline.h | 93 +++++ .../intel_timeline_types.h} | 8 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 +- drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- drivers/gpu/drm/i915/gt/mock_engine.c | 11 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 22 +- .../selftest_timeline.c} | 124 +++--- .../gpu/drm/i915/gt/selftest_workarounds.c | 7 +- .../i915/{ => gt}/selftests/mock_timeline.c | 8 +- .../i915/{ => gt}/selftests/mock_timeline.h | 6 +- drivers/gpu/drm/i915/i915_drv.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 52 +-- drivers/gpu/drm/i915/i915_gem.c | 238 +++++------ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 32 ++ drivers/gpu/drm/i915/i915_gem_fence_reg.h | 3 + drivers/gpu/drm/i915/i915_gem_gtt.c | 371 +++++++++++------- drivers/gpu/drm/i915/i915_gem_gtt.h | 10 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_request.c | 14 +- drivers/gpu/drm/i915/i915_request.h | 8 +- drivers/gpu/drm/i915/i915_timeline.h | 94 ----- drivers/gpu/drm/i915/i915_vgpu.c | 24 +- drivers/gpu/drm/i915/i915_vgpu.h | 4 +- drivers/gpu/drm/i915/i915_vma.c | 3 +- drivers/gpu/drm/i915/intel_wopcm.c | 31 +- drivers/gpu/drm/i915/intel_wopcm.h | 4 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +- .../drm/i915/selftests/i915_live_selftests.h | 2 +- .../drm/i915/selftests/i915_mock_selftests.h | 2 +- drivers/gpu/drm/i915/selftests/i915_request.c | 10 +- drivers/gpu/drm/i915/selftests/i915_vma.c | 1 + drivers/gpu/drm/i915/selftests/igt_spinner.c | 7 +- drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 + .../gpu/drm/i915/selftests/mock_gem_device.c | 15 +- drivers/gpu/drm/i915/selftests/mock_gtt.c | 1 + 62 files changed, 1229 insertions(+), 923 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (72%) create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (92%) rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%) rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%) rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%) delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h