[PULL] drm-intel-next
diff mbox series

Message ID 20190822192950.GA4813@intel.com
State New
Headers show
Series
  • [PULL] drm-intel-next
Related show

Pull-request

git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2019-08-22

Commit Message

Rodrigo Vivi Aug. 22, 2019, 7:29 p.m. UTC
Hi Dave and Daniel,

Here goes the final pull request targeting 5.4.

It's important to highlight that we got a conflict on a backmerge yesterday
which had already been solved on linux-next with a fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Aug 2019 12:48:39 +1000
Subject: [PATCH] drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/gt/intel_engine_pool.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)


which is a simplified version from a previous one which had:
Reviewed-by: Christian König <christian.koenig@amd.com>

With this we could also remove the latest dma_resv fixup patch from drm_rerere.

Unfortunately on this merge commit a ghost file reapeared probably by an
amend mistake from my side. And consequently removed by Chris with an extra
patch. I hope this doesn't cause any trouble for you, but if so the solution
is simply go with the version that deletes the file for good.

This pull request also includes Gvt stuff including several enhancements for
command parser and batch buffer shadow, remove extra debugfs function return
check, and other misc changes like typo, static check fix, etc.

The rest is just as usual and split in 3 different drm-intel-next tags:

drm-intel-next-2019-08-22:
- More TGL enabling work (Michel, Jose, Lucas)
- Fixes on DP MST (Ville)
- More GTT and Execlists fixes and improvements (Chris)
- Code style clean-up on hdmi and dp side (Jani)
- Fix null pointer dereferrence (Xiong)
- Fix a couple of missing serialization on selftests (Chris)
- More vm locking rework (Chris)

drm-intel-next-2019-08-20:
- GuC and HuC related fixes and improvements (Daniele, Michal)
- Improve debug with more engine information and rework on debugfs files (Chris, Stuart)
- Simplify appearture address handling (Chris)
- Other fixes and cleanups around engines and execlists (Chris)
- Selftests fixes (Matt, Chris)
- Gen11 cache flush related fixes and improvements (Mika)
- More work around requests, timelines and locks to allow removal of struct_mutex (Chris)
- Add missing CML PCI ID (Anusha)
- More work on the new i915 buddy allocator (Matt)
- More headers, files and directories reorg (Daniele)
- Improvements on ggtt’s get pdp (Mika)
- Fix GPU reset (Chris)
- Fix GPIO pins on gen11 (Matt)
- Fix HW readout for crtc_clock in HDMI mode (Imre)
- Sanitize display Phy during unitit to workaround messages of HW state change during suspend (Imre)
- Be defensive when starting vma activity (Chris)
- More Tiger Lake enabling work (Michel, Daniele, Lucas)
- Relax pd_used assertion (Chris)

drm-intel-next-2019-08-13:
- More Tiger Lake enabling work (Lucas, Jose, Tomasz, Michel, Jordan, Anusha, Vandita)
- More selftest organization reworks, fixes and improvements (Lucas, Chris)
- Simplifications on GEM code like context and cleanup_early (Chris, Daniele)
- GuC and HuC related fixes and improvements (Daniele, Michal, Chris)
- Some clean up and fixes on headers, Makefile, and generated files (Lucas, Jani)
- MOCS setup clean up (Tvrtko)
- More Elkhartlake enabling work (Jose, Matt)
- Fix engine reset by clearing in flight execlists requests (Chris)
- Fix possible memory leak on intel_hdcp_auth_downstream (Wei)
- Introduce intel_gt_runtime_suspend/resume (Daniele)
- PMU improvements (Tvrtko)
- Flush extra hard after writing relocations through the GTT (Chris)
- Documentations fixes (Michal, Chris)
- Report dma_reserv allocation failure (Chris)
- Improvements around shrinker (Chris)
- More improvements around engine handling (Chris)
- Also more s/dev_priv/i915 (Chris)
- Abstract display suspend/resume operations (Rodrigo/Jani)
- Drop VM_IO from GTT mappings (Chris)
- Fix some NULL vs IS_ERR conditions (Dan)
- General improvements on error state (Chris)
- Isolate i915_getparam_iocrtl to its own file (Chris)
- Perf OA object refactor (Umesh)
- Ignore central i915->kernel_context and allocate it directly (Chris)
- More fixes and improvements around wakerefs (Chris)
- Clean-up and improvements around debugfs (Chris)
- Free the imported shmemfs file for phys objects (Chris)
- Many other fix and cleanups around engines and execlists (Chris)
- Split out uncore_mmio_debug (Daniele)
- Memory management fixes for blk and gtt (Matt)
- Introduction of buddy allocator to handle huge-pages for GTT (Matt)
- Fix ICL and TGL PG3 power domains (Anshuman)
- Extract GT IRQ to gt/ (Andi)
- Drop last_fence tracking in favor of whole vma->active (Chris)
- Make overlay to use i915_active instead of i915_active_request (Chris)
- Move misc display IRQ handling to its own function (Jose)
- Introduce new _TRANS2() macro in preparation for some coming PSR related work (Jose)

This tag also includes Gvt stuff including several enhancements for command parser and batch buffer shadow, remove extra debugfs function return check, and other misc changes like typo, static check fix, etc.

Thanks,
Rodrigo.

The following changes since commit ae4530062620561d24683b1bd3438b8397693429:

  Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next (2019-08-22 13:21:16 +1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2019-08-22

for you to fetch changes up to be91233b1053d9725d3a437e3da44ccff2639477:

  drm/i915: Update DRIVER_DATE to 20190822 (2019-08-22 05:46:28 -0700)

----------------------------------------------------------------
- More TGL enabling work (Michel, Jose, Lucas)
- Fixes on DP MST (Ville)
- More GTT and Execlists fixes and improvements (Chris)
- Code style clean-up on hdmi and dp side (Jani)
- Fix null pointer dereferrence (Xiong)
- Fix a couple of missing serialization on selftests (Chris)
- More vm locking rework (Chris)

----------------------------------------------------------------
Andi Shyti (2):
      drm/i915: Extract GT powermanagement interrupt handling
      drm/i915: Extract general GT interrupt handlers

Anshuman Gupta (2):
      drm/i915/icl: Remove DDI IO power domain from PG3 power domains
      drm/i915/tgl: Fixing up list of PG3 power domains.

Anusha Srivatsa (2):
      drm/i915/dmc: Load DMC on TGL
      drm/i915/cml: Add Missing PCI IDs

Chris Wilson (85):
      drm/i915: Avoid ce->gem_context->i915
      drm/i915/selftests: Pass intel_context to igt_spinner
      drm/i915/execlists: Always clear pending&inflight requests on reset
      drm/i915: Remove lrc default desc from GEM context
      drm/i915/pmu: Atomically acquire the gt_pm wakeref
      drm/i915: Flush extra hard after writing relocations through the GTT
      drm/i915: Allow sharing the idle-barrier from other kernel requests
      drm/i915: Report resv_obj allocation failure
      drm/i915: Hide unshrinkable context objects from the shrinker
      drm/i915: Flush the freed object list on file close
      drm/i915: Teach execbuffer to take the engine wakeref not GT
      drm/i915: Replace struct_mutex for batch pool serialisation
      drm/i915/gt: Remove stale kerneldoc for internal MOCS functions
      drm/i915: Use drm_i915_private directly from drv_get_drvdata()
      drm/i915/gem: Make caps.scheduler static
      drm/i915/gt: Move the [class][inst] lookup for engines onto the GT
      drm/i915: Drop expectations of VM_IO from our GGTT mmappings
      drm/i915: Rename engines to match their user interface
      drm/i915: Use intel_engine_lookup_user for probing HAS_BSD etc
      drm/i915: Include the DRIVER_DATE in the error state
      drm/i915: Isolate i915_getparam_ioctl()
      drm/i915/selftests: Pass intel_context to mock_request
      drm/i915: Allocate kernel_contexts directly
      drm/i915: Fix up the inverse mapping for default ctx->engines[]
      drm/i915/selftests: Fixup a missing legacy_idx
      drm/i915: Defer final intel_wakeref_put to process context
      drm/i915: Only include active engines in the capture state
      drm/i915: Make debugfs/per_file_stats scale better
      drm/i915: Free the imported shmemfs file for phys objects
      drm/i915/execlists: Backtrack along timeline
      drm/i915: Check for a second VCS engine more carefully
      drm/i915: Replace global bsd_dispatch_index with random seed
      drm/i915: Generalise BSD default selection
      drm/i915: Drop the fudge warning on ring restart for ctg/elk
      drm/i915: Remove i915_gem_context_create_gvt()
      drm/i915/gt: Make deferred context allocation explicit
      drm/i915: Push the ring creation flags to the backend
      drm/i915: Lift timeline into intel_context
      drm/i915: Stop reconfiguring our shmemfs mountpoint
      drm/i915: Remove unused debugfs/i915_emon_status
      drm/i915/execlists: Avoid sync calls during park
      drm/i915/selftests: Prevent the timeslice expiring during suppression tests
      drm/i915/gt: Use the local engine wakeref when checking RING registers
      drm/i915: Forgo last_fence active request tracking
      drm/i915/overlay: Switch to using i915_active tracking
      drm/i915/guc: Use a local cancel_port_requests
      drm/i915: Push the wakeref->count deferral to the backend
      drm/i915/gt: Save/restore interrupts around breadcrumb disable
      drm/i915: Include engine->mmio_base in the debug dump
      drm/i915: Disregard drm_mode_config.fb_base
      drm/i915: Serialise read/write of the barrier's engine
      drm/i915: Convert a few more bland dmesg info to be device specific
      drm/i915: Move tasklet kicking to __i915_request_queue caller
      drm/i915/gt: Track timeline activeness in enter/exit
      drm/i915/gt: Convert timeline tracking to spinlock
      drm/i915/gt: Guard timeline pinning without relying on struct_mutex
      drm/i915: Protect request retirement with timeline->mutex
      drm/i915: Extract intel_frontbuffer active tracking
      drm/i915: Use the associated uncore for the vm
      drm/i915/gt: Mark context->active_count as protected by timeline->mutex
      drm/i915: Markup expected timeline locks for i915_active
      drm/i915/execlists: Lift process_csb() out of the irq-off spinlock
      drm/i915/selftests: Check the context size
      drm/i915: Propagate fence errors
      drm/i915: Always wrap the ring offset before resetting
      drm/i915/gt: Mark up the nested engine-pm timeline lock as irqsafe
      drm/i915: Only emit the 'send bug report' once for a GPU hang
      drm/i915: Serialize against vma moves
      drm/i915: i915_active.retire() is optional
      drm/i915: Use 0 for the unordered context
      drm/i915: Assume exclusive access to objects inside resume
      drm/i915: Serialize insertion into the file->mm.request_list
      drm/i915: Be defensive when starting vma activity
      drm/i915/gtt: Relax pd_used assertion
      drm/i915/gtt: Relax assertion for pt_used
      drm/i915/gtt: Include asm/smp.h
      drm/i915: Replace PIN_NONFAULT with calls to PIN_NOEVICT
      drm/i915/execlists: Set priority hint prior to submission
      drm/i915/gtt: Add some range asserts
      drm/i915/selftests: Fixup a couple of missing serialisation with vma
      drm/i915: Generalise the clflush dma-worker
      drm/i915: Track ggtt fence reservations under its own mutex
      drm/i915: Pull obj->userfault tracking under the ggtt->mutex
      drm/i915: Replace i915_vma_put_fence()
      drm/i915: Kill the undead i915_gem_batch_pool.c

Dan Carpenter (1):
      drm/i915: Fix some NULL vs IS_ERR() conditions

Daniele Ceraolo Spurio (18):
      drm/i915/uc: Don't enable communication twice on resume
      drm/i915/uc: Move uC WOPCM setup in uc_init_hw
      drm/i915/gt: Move gt_cleanup_early out of gem_cleanup_early
      drm/i915/uc: Move uC early functions inside the GT ones
      drm/i915/gt: Introduce intel_gt_runtime_suspend/resume
      drm/i915: split out uncore_mmio_debug
      drm/i915/guc: keep breadcrumb irq always enabled
      drm/i915: drop engine_pin/unpin_breadcrumbs_irq
      drm/i915/guc: Remove client->submissions
      drm/i915: Move i915_power_well_id out of i915_reg.h
      drm/i915: Move engine IDs out of i915_reg.h
      drm/i915: Move gmbus definitions out of i915_reg.h
      drm/i915: Wrappers for display register waits
      drm/i915/tgl: add Gen12 default indirect ctx offset
      drm/i915/tgl: add GEN12_MAX_CONTEXT_HW_ID
      drm/i915/tgl: Gen12 csb support
      drm/i915/tgl: Gen12 render context size
      drm/i915: Dynamically allocate s0ix struct for VLV

Gao, Fred (3):
      drm/i915/gvt: Utility for valid command length check
      drm/i915/gvt: Add MI command valid length check
      drm/i915/gvt: Add valid length check for MI variable commands

Greg Kroah-Hartman (1):
      drm/i915/gvt: no need to check return value of debugfs_create functions

Gustavo A. R. Silva (1):
      drm/i915/kvmgt: Use struct_size() helper

Imre Deak (2):
      drm/i915: Fix HW readout for crtc_clock in HDMI mode
      drm/i915: Sanitize PHY state during display core uninit

Jani Nikula (28):
      drm/i915/oa: add content to Makefile
      drm/i915/oa: update the generated files
      drm/i915: move intel_display.c function declarations
      drm/i915/sprite: un-inline icl_is_hdr_plane()
      drm/i915/irq: un-inline functions to avoid i915_drv.h include
      drm/i915/bw: make intel_atomic_get_bw_state() static
      drm/i915/mst: un-inline intel_dp_mst_encoder_active_links()
      drm/i915/tc: un-inline intel_tc_port_ref_held()
      drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h
      drm/i915: rename intel_drv.h to display/intel_display_types.h
      drm/i915: remove unnecessary includes of intel_display_types.h header
      drm/i915: move property enums to intel_display_types.h
      drm/i915: split out intel_pch.[ch] from i915_drv.[ch]
      drm/i915: remove unused dev_priv->no_aux_handshake
      drm/i915: move add_taint_for_CI() to i915_utils.h
      drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h
      drm/i915: move printing and load error inject to i915_utils.[ch]
      drm/i915: extract i915_perf.h from i915_drv.h
      drm/i915: extract i915_sysfs.h from i915_drv.h
      drm/i915: extract i915_suspend.h from i915_drv.h
      drm/i915: extract i915_memcpy.h from i915_drv.h
      drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h
      drm/i915: extract i915_gem_shrinker.h from i915_drv.h
      drm/i915/dp: stylistic cleanup around hdcp2_msg_data
      drm/i915/dp: avoid shadowing variables
      drm/i915/dp: make hdcp2_dp_msg_data const
      drm/i915/hdmi: stylistic cleanup around hdcp2_msg_data
      drm/i915/hdmi: make hdcp2_msg_data const

Jordan Justen (1):
      drm/i915/tgl: allow the reg_read ioctl to read the RCS TIMESTAMP register

José Roberto de Souza (9):
      drm/i915/tgl: Update north display hotplug detection to TGL connections
      drm/i915/ehl: Ungate DDIC and DDID
      drm/i915/tgl: Add and use new DC5 and DC6 residency counter registers
      drm/i915: Get transcoder power domain before reading its register
      drm/i915/tgl: Fix the read of the DDI that transcoder is attached to
      drm/i915/tgl: Fix missing parentheses on TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT
      drm/i915/bdw+: Move misc display IRQ handling to it own function
      drm/i915: Add _TRANS2()
      drm/i915/tgl: Move transcoders to pipes' powerwells

Lucas De Marchi (9):
      drm/i915/tgl: Add hpd interrupt handling
      drm/i915/tgl: handle DP aux interrupts
      drm/i915: make i915_selftest.h self-contained
      drm/i915: remove dangling forward declaration
      drm/i915/tgl: Move fault registers to their new offset
      drm/i915/tgl: stop using ERROR_GEN6 and DONE_REG
      drm/i915/tgl: Introduce initial Tiger Lake workarounds
      drm/i915/tgl: disable DDIC
      drm/i915/tgl: update DMC firmware to 2.04

Matt Roper (2):
      drm/i915/ehl: Don't forget to handle port C's hotplug interrupts
      drm/i915/gen11: Allow usage of all GPIO pins

Matthew Auld (10):
      drm/i915/blt: don't assume pinned intel_context
      drm/i915/blt: bump the size restriction
      drm/i915/selftests: move gpu-write-dw into utils
      drm/i915/gtt: enable GTT cache by default
      drm/i915/gtt: disable 2M pages for pre-gen11
      drm/i915/blt: support copying objects
      drm/i915: buddy allocator
      drm/i915/selftest/buddy: fixup igt_buddy_alloc_range
      drm/i915/buddy: tidy up i915_buddy_fini
      drm/i915/buddy: use kmemleak_update_trace

Michal Wajdeczko (39):
      drm/i915/uc: Rename intel_uc_is_using* into intel_uc_supports*
      drm/i915/uc: Consider enable_guc modparam during fw selection
      drm/i915/guc: Use dedicated flag to track submission mode
      drm/i915/uc: Stop sanitizing enable_guc modparam
      drm/i915: Fix documentation for __intel_wait_for_register_fw*
      drm/i915: Add i915 to i915_inject_probe_failure
      drm/i915/uc: Do full sanitize instead of pure reset
      drm/i915/uc: Reorder firmware status codes
      drm/i915/uc: Move GuC error log to uc and release it on fini
      drm/i915/uc: Inject probe errors into intel_uc_init_hw
      drm/i915/wopcm: Don't fail on WOPCM partitioning failure
      drm/i915/guc: Prefer intel_guc_is_submission_supported
      drm/i915/huc: Prefer intel_huc_is_supported
      drm/i915/uc: Remove redundant GuC support checks
      drm/i915/uc: Don't fail on HuC early init errors
      drm/i915/uc: Prefer dev_info for reporting options
      drm/i915/uc: HuC firmware can't be supported without GuC
      drm/i915/uc: Don't fetch HuC fw if GuC fw fetch already failed
      drm/i915: Don't try to partition WOPCM without GuC firmware
      drm/i915: Make wopcm_to_i915() private
      drm/i915/uc: WOPCM programming errors are not always real
      drm/i915/uc: Hardening firmware fetch
      drm/i915/uc: Fail early if there is no GuC fw available
      drm/i915/uc: Include HuC firmware version in summary
      drm/i915/uc: Update messages from fw upload step
      drm/i915/uc: Use -EIO code for GuC initialization failures
      drm/i915/uc: Update copyright and license
      drm/i915/uc: Log fw status changes only under debug config
      drm/i915/wopcm: Check WOPCM layout separately from calculations
      drm/i915/wopcm: Try to use already locked WOPCM layout
      drm/i915/wopcm: Update error messages
      drm/i915/wopcm: Fix SPDX tag location
      drm/i915/uc: Add explicit DISABLED state for firmware
      drm/i915/uc: Cleanup fw fetch only if it was successful
      drm/i915/uc: Cleanup fw fetch on every GuC/HuC init failure
      drm/i915/uc: Never fail on uC preparation step
      drm/i915/guc: Don't open log relay if GuC is not running
      drm/i915/uc: Don't always fail on unavailable GuC firmware
      drm/i915/uc: Never fail on HuC firmware errors

Michał Winiarski (1):
      drm/i915/uc: Move FW size sanity check back to fetch

Michel Thierry (4):
      drm/i915/tgl: Tigerlake only has global MOCS registers
      drm/i915/tgl: Report valid VDBoxes with SFC capability
      drm/i915/tgl: Updated Private PAT programming
      drm/i915/tgl: add support for reading the timestamp frequency

Mika Kuoppala (4):
      drm/i915/icl: Implement gen11 flush including tile cache
      drm/i915/icl: Add command cache invalidate
      drm/i915/icl: Add gen11 specific render breadcrumbs
      drm/i915/gtt: Fold gen8 insertions into one

Rodrigo Vivi (6):
      drm/i915: abstract display suspend/resume operations
      Merge tag 'gvt-next-2019-08-13' of https://github.com/intel/gvt-linux into drm-intel-next-queued
      drm/i915: Update DRIVER_DATE to 20190813
      drm/i915: Update DRIVER_DATE to 20190820
      Merge drm/drm-next into drm-intel-next-queued
      drm/i915: Update DRIVER_DATE to 20190822

Stanislav Lisovskiy (1):
      drm/i915: Fix wrong escape clock divisor init for GLK

Stuart Summers (1):
      drm/i915: Print CCID for all renderCS

Tina Zhang (1):
      drm/i915/gvt: Double check batch buffer size after copy

Tomasz Lis (1):
      drm/i915/tgl: Define MOCS entries for Tigerlake

Tvrtko Ursulin (5):
      drm/i915: Move MOCS setup to intel_mocs.c
      drm/i915/pmu: Make more struct i915_pmu centric
      drm/i915/pmu: Convert engine sampling to uncore mmio
      drm/i915/pmu: Convert sampling to gt
      drm/i915/pmu: Make get_rc6 take intel_gt

Umesh Nerlige Ramappa (1):
      drm/i915/perf: Refactor oa object to better manage resources

Vandita Kulkarni (6):
      drm/i915/tgl/dsi: Program TRANS_VBLANK register
      drm/i915/tgl/dsi: Set latency PCS_DW1 for tgl
      drm/i915/tgl/dsi: Do not override TA_SURE
      drm/i915/tgl/dsi: Gate the ddi clocks after pll mapping
      drm/i915/tgl: Add mipi dsi support for TGL
      drm/i915/tgl/dsi: Enable blanking packets during BLLP for video mode

Ville Syrjälä (2):
      drm/i915: Fix DP-MST crtc_mask
      drm/i915: Do not create a new max_bpc prop for MST connectors

Wei Yongjun (1):
      drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()

Xiong Zhang (1):
      drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest

Zhenyu Wang (1):
      drm/i915/gvt: Fix typo of VBLANK_TIMER_PERIOD

Zhi Wang (1):
      drm/i915/gvt: factor out tlb and mocs register offset table

 Documentation/gpu/i915.rst                         |    3 -
 drivers/gpu/drm/i915/Makefile                      |   12 +-
 drivers/gpu/drm/i915/display/dvo_ch7017.c          |    2 +-
 drivers/gpu/drm/i915/display/dvo_ch7xxx.c          |    2 +-
 drivers/gpu/drm/i915/display/dvo_ivch.c            |    2 +-
 drivers/gpu/drm/i915/display/dvo_ns2501.c          |    2 +-
 drivers/gpu/drm/i915/display/dvo_sil164.c          |    2 +-
 drivers/gpu/drm/i915/display/dvo_tfp410.c          |    2 +-
 drivers/gpu/drm/i915/display/icl_dsi.c             |   65 +-
 drivers/gpu/drm/i915/display/intel_atomic.c        |    2 +-
 drivers/gpu/drm/i915/display/intel_atomic_plane.c  |    3 +-
 drivers/gpu/drm/i915/display/intel_audio.c         |    2 +-
 drivers/gpu/drm/i915/display/intel_bios.c          |   23 +-
 drivers/gpu/drm/i915/display/intel_bw.c            |   16 +-
 drivers/gpu/drm/i915/display/intel_bw.h            |   15 -
 drivers/gpu/drm/i915/display/intel_cdclk.c         |   22 +-
 drivers/gpu/drm/i915/display/intel_color.c         |    2 +-
 drivers/gpu/drm/i915/display/intel_combo_phy.c     |    2 +-
 drivers/gpu/drm/i915/display/intel_connector.c     |    4 +-
 drivers/gpu/drm/i915/display/intel_crt.c           |   17 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           |   29 +-
 drivers/gpu/drm/i915/display/intel_display.c       |  134 +--
 drivers/gpu/drm/i915/display/intel_display.h       |  189 ++++
 drivers/gpu/drm/i915/display/intel_display_power.c |  147 ++-
 drivers/gpu/drm/i915/display/intel_display_power.h |   38 +-
 .../{intel_drv.h => display/intel_display_types.h} |  158 +--
 drivers/gpu/drm/i915/display/intel_dp.c            |  102 +-
 .../gpu/drm/i915/display/intel_dp_aux_backlight.c  |    2 +-
 .../gpu/drm/i915/display/intel_dp_link_training.c  |    2 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   27 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.h        |    9 +-
 drivers/gpu/drm/i915/display/intel_dpio_phy.c      |    8 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c      |   46 +-
 drivers/gpu/drm/i915/display/intel_dsi.h           |    3 +-
 .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c |    2 +-
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c       |    2 +-
 drivers/gpu/drm/i915/display/intel_dvo.c           |    2 +-
 drivers/gpu/drm/i915/display/intel_fbc.c           |    7 +-
 drivers/gpu/drm/i915/display/intel_fbdev.c         |   51 +-
 drivers/gpu/drm/i915/display/intel_fifo_underrun.c |    3 +-
 drivers/gpu/drm/i915/display/intel_frontbuffer.c   |  257 +++--
 drivers/gpu/drm/i915/display/intel_frontbuffer.h   |   70 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c         |   29 +-
 drivers/gpu/drm/i915/display/intel_gmbus.h         |   22 +
 drivers/gpu/drm/i915/display/intel_hdcp.c          |   39 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          |   43 +-
 drivers/gpu/drm/i915/display/intel_hotplug.c       |    8 +-
 drivers/gpu/drm/i915/display/intel_lspcon.c        |    2 +-
 drivers/gpu/drm/i915/display/intel_lvds.c          |    8 +-
 drivers/gpu/drm/i915/display/intel_opregion.c      |    2 +-
 drivers/gpu/drm/i915/display/intel_overlay.c       |  143 ++-
 drivers/gpu/drm/i915/display/intel_panel.c         |    2 +-
 drivers/gpu/drm/i915/display/intel_pipe_crc.c      |    2 +-
 drivers/gpu/drm/i915/display/intel_psr.c           |    8 +-
 drivers/gpu/drm/i915/display/intel_quirks.c        |    2 +-
 drivers/gpu/drm/i915/display/intel_sdvo.c          |    2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c        |    9 +-
 drivers/gpu/drm/i915/display/intel_sprite.h        |    8 +-
 drivers/gpu/drm/i915/display/intel_tc.c            |    7 +
 drivers/gpu/drm/i915/display/intel_tc.h            |    9 +-
 drivers/gpu/drm/i915/display/intel_tv.c            |    2 +-
 drivers/gpu/drm/i915/display/intel_vbt_defs.h      |    3 -
 drivers/gpu/drm/i915/display/intel_vdsc.c          |    2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c             |   84 +-
 drivers/gpu/drm/i915/display/vlv_dsi_pll.c         |   20 +-
 drivers/gpu/drm/i915/gem/i915_gem_clflush.c        |  127 +--
 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c     |   39 +-
 drivers/gpu/drm/i915/gem/i915_gem_context.c        |  170 ++-
 drivers/gpu/drm/i915/gem/i915_gem_context.h        |    2 -
 drivers/gpu/drm/i915/gem/i915_gem_context_types.h  |    5 -
 drivers/gpu/drm/i915/gem/i915_gem_domain.c         |   49 +-
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     |  321 +++---
 drivers/gpu/drm/i915/gem/i915_gem_fence.c          |    3 +-
 drivers/gpu/drm/i915/gem/i915_gem_mman.c           |   24 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c         |   78 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.h         |    6 +-
 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c     |  370 ++++++-
 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h     |   25 +-
 drivers/gpu/drm/i915/gem/i915_gem_object_types.h   |    9 +-
 drivers/gpu/drm/i915/gem/i915_gem_pages.c          |   13 +-
 drivers/gpu/drm/i915/gem/i915_gem_phys.c           |    7 +
 drivers/gpu/drm/i915/gem/i915_gem_pm.c             |   18 +-
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c          |    1 +
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c       |   74 +-
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h       |   31 +
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c         |    9 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.h         |   35 +
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |    3 +-
 drivers/gpu/drm/i915/gem/i915_gemfs.c              |   31 +-
 drivers/gpu/drm/i915/gem/selftests/huge_pages.c    |  120 +--
 .../drm/i915/gem/selftests/i915_gem_client_blt.c   |   16 +-
 .../drm/i915/gem/selftests/i915_gem_coherency.c    |    4 +-
 .../gpu/drm/i915/gem/selftests/i915_gem_context.c  |  193 +---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c |    9 +-
 .../drm/i915/gem/selftests/i915_gem_object_blt.c   |  128 ++-
 drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c |  141 ++-
 drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h |   16 +
 drivers/gpu/drm/i915/gt/intel_breadcrumbs.c        |   36 +-
 drivers/gpu/drm/i915/gt/intel_context.c            |   87 +-
 drivers/gpu/drm/i915/gt/intel_context.h            |   41 +-
 drivers/gpu/drm/i915/gt/intel_context_types.h      |   12 +-
 drivers/gpu/drm/i915/gt/intel_engine.h             |   17 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c          |  243 ++---
 drivers/gpu/drm/i915/gt/intel_engine_pm.c          |   68 +-
 drivers/gpu/drm/i915/gt/intel_engine_pm.h          |   18 +-
 drivers/gpu/drm/i915/gt/intel_engine_pool.c        |  177 ++++
 drivers/gpu/drm/i915/gt/intel_engine_pool.h        |   34 +
 drivers/gpu/drm/i915/gt/intel_engine_pool_types.h  |   29 +
 drivers/gpu/drm/i915/gt/intel_engine_types.h       |   59 +-
 drivers/gpu/drm/i915/gt/intel_engine_user.c        |  303 ++++++
 drivers/gpu/drm/i915/gt/intel_engine_user.h        |   25 +
 drivers/gpu/drm/i915/gt/intel_gpu_commands.h       |   11 +-
 drivers/gpu/drm/i915/gt/intel_gt.c                 |   36 +-
 drivers/gpu/drm/i915/gt/intel_gt.h                 |    2 +-
 drivers/gpu/drm/i915/gt/intel_gt_irq.c             |  455 ++++++++
 drivers/gpu/drm/i915/gt/intel_gt_irq.h             |   44 +
 drivers/gpu/drm/i915/gt/intel_gt_pm.c              |   40 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm.h              |   31 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c          |  109 ++
 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h          |   22 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h           |   14 +-
 drivers/gpu/drm/i915/gt/intel_lrc.c                |  486 ++++++---
 drivers/gpu/drm/i915/gt/intel_lrc_reg.h            |    1 +
 drivers/gpu/drm/i915/gt/intel_mocs.c               |  166 +--
 drivers/gpu/drm/i915/gt/intel_mocs.h               |    3 +-
 drivers/gpu/drm/i915/gt/intel_renderstate.c        |    4 +-
 drivers/gpu/drm/i915/gt/intel_reset.c              |   16 +-
 drivers/gpu/drm/i915/gt/intel_ringbuffer.c         |  147 +--
 drivers/gpu/drm/i915/gt/intel_sseu.c               |    2 +-
 drivers/gpu/drm/i915/gt/intel_timeline.c           |  132 +--
 drivers/gpu/drm/i915/gt/intel_timeline.h           |    3 +-
 drivers/gpu/drm/i915/gt/intel_timeline_types.h     |   20 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.c        |   26 +-
 drivers/gpu/drm/i915/gt/mock_engine.c              |   98 +-
 drivers/gpu/drm/i915/gt/selftest_context.c         |  456 ++++++++
 drivers/gpu/drm/i915/gt/selftest_engine.c          |   28 +
 drivers/gpu/drm/i915/gt/selftest_engine.h          |   14 +
 drivers/gpu/drm/i915/gt/selftest_engine_cs.c       |   26 +-
 drivers/gpu/drm/i915/gt/selftest_engine_pm.c       |   83 ++
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c       |   17 +-
 drivers/gpu/drm/i915/gt/selftest_lrc.c             |  143 +--
 drivers/gpu/drm/i915/gt/selftest_timeline.c        |    6 +-
 drivers/gpu/drm/i915/gt/selftest_workarounds.c     |   33 +-
 drivers/gpu/drm/i915/gt/selftests/mock_timeline.c  |    2 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc.c             |   38 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc.h             |   43 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c         |   23 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h         |   23 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c          |   22 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h          |   22 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c          |   31 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h          |   23 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h        |   23 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c         |   30 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.h         |   23 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h         |   24 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c  |  108 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h  |   26 +-
 drivers/gpu/drm/i915/gt/uc/intel_huc.c             |   57 +-
 drivers/gpu/drm/i915/gt/uc/intel_huc.h             |   33 +-
 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c          |   13 +-
 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h          |    5 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc.c              |  395 ++++---
 drivers/gpu/drm/i915/gt/uc/intel_uc.h              |   62 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c           |  292 ++++--
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h           |  134 ++-
 drivers/gpu/drm/i915/gt/uc/selftest_guc.c          |   21 +-
 drivers/gpu/drm/i915/gvt/aperture_gm.c             |   10 +-
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |  180 +++-
 drivers/gpu/drm/i915/gvt/debugfs.c                 |   47 +-
 drivers/gpu/drm/i915/gvt/gvt.c                     |    4 +-
 drivers/gpu/drm/i915/gvt/gvt.h                     |    8 +-
 drivers/gpu/drm/i915/gvt/interrupt.c               |    4 +-
 drivers/gpu/drm/i915/gvt/kvmgt.c                   |   15 +-
 drivers/gpu/drm/i915/gvt/mmio_context.c            |   57 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   36 +-
 drivers/gpu/drm/i915/gvt/vgpu.c                    |    4 +-
 drivers/gpu/drm/i915/i915_active.c                 |  331 +++++-
 drivers/gpu/drm/i915/i915_active.h                 |   33 +-
 drivers/gpu/drm/i915/i915_active_types.h           |   17 +-
 drivers/gpu/drm/i915/i915_buddy.c                  |  428 ++++++++
 drivers/gpu/drm/i915/i915_buddy.h                  |  128 +++
 drivers/gpu/drm/i915/i915_cmd_parser.c             |    4 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  290 ++----
 drivers/gpu/drm/i915/i915_drv.c                    |  791 ++++----------
 drivers/gpu/drm/i915/i915_drv.h                    |  583 +++--------
 drivers/gpu/drm/i915/i915_gem.c                    |  293 ++----
 drivers/gpu/drm/i915/i915_gem.h                    |    2 +
 drivers/gpu/drm/i915/i915_gem_batch_pool.c         |  132 ---
 drivers/gpu/drm/i915/i915_gem_batch_pool.h         |   26 -
 drivers/gpu/drm/i915/i915_gem_evict.c              |    9 -
 drivers/gpu/drm/i915/i915_gem_fence_reg.c          |  108 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.h          |    2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  181 ++--
 drivers/gpu/drm/i915/i915_gem_gtt.h                |    6 +-
 drivers/gpu/drm/i915/i915_getparam.c               |  168 +++
 drivers/gpu/drm/i915/i915_globals.c                |    1 +
 drivers/gpu/drm/i915/i915_globals.h                |    1 +
 drivers/gpu/drm/i915/i915_gpu_error.c              |  288 +++--
 drivers/gpu/drm/i915/i915_gpu_error.h              |    7 +-
 drivers/gpu/drm/i915/i915_irq.c                    | 1095 ++++++--------------
 drivers/gpu/drm/i915/i915_irq.h                    |   79 +-
 drivers/gpu/drm/i915/i915_memcpy.c                 |    2 +-
 drivers/gpu/drm/i915/i915_memcpy.h                 |   32 +
 drivers/gpu/drm/i915/i915_mm.c                     |    5 +-
 drivers/gpu/drm/i915/i915_pci.c                    |   28 +-
 drivers/gpu/drm/i915/i915_perf.c                   |  546 +++++-----
 drivers/gpu/drm/i915/i915_perf.h                   |   32 +
 drivers/gpu/drm/i915/i915_pmu.c                    |  294 +++---
 drivers/gpu/drm/i915/i915_priolist_types.h         |   25 +-
 drivers/gpu/drm/i915/i915_query.c                  |    5 +-
 drivers/gpu/drm/i915/i915_reg.h                    |  131 ++-
 drivers/gpu/drm/i915/i915_request.c                |  252 ++---
 drivers/gpu/drm/i915/i915_request.h                |    5 +-
 drivers/gpu/drm/i915/i915_scheduler.c              |    3 +-
 drivers/gpu/drm/i915/i915_selftest.h               |    2 +
 drivers/gpu/drm/i915/i915_suspend.c                |    3 +-
 drivers/gpu/drm/i915/i915_suspend.h                |   14 +
 drivers/gpu/drm/i915/i915_sw_fence.c               |   23 +-
 drivers/gpu/drm/i915/i915_sw_fence.h               |    7 +
 drivers/gpu/drm/i915/i915_sw_fence_work.c          |   95 ++
 drivers/gpu/drm/i915/i915_sw_fence_work.h          |   44 +
 drivers/gpu/drm/i915/i915_sysfs.c                  |    2 +-
 drivers/gpu/drm/i915/i915_sysfs.h                  |   14 +
 drivers/gpu/drm/i915/i915_trace.h                  |   12 +-
 drivers/gpu/drm/i915/i915_utils.c                  |   78 ++
 drivers/gpu/drm/i915/i915_utils.h                  |   59 +-
 drivers/gpu/drm/i915/i915_vgpu.c                   |    4 +-
 drivers/gpu/drm/i915/i915_vma.c                    |   80 +-
 drivers/gpu/drm/i915/i915_vma.h                    |   21 +-
 drivers/gpu/drm/i915/intel_csr.c                   |    7 +
 drivers/gpu/drm/i915/intel_device_info.c           |    5 +-
 drivers/gpu/drm/i915/intel_device_info.h           |    1 +
 drivers/gpu/drm/i915/intel_gvt.c                   |    2 +-
 drivers/gpu/drm/i915/intel_pch.c                   |  201 ++++
 drivers/gpu/drm/i915/intel_pch.h                   |   73 ++
 drivers/gpu/drm/i915/intel_pm.c                    |   19 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |    1 +
 drivers/gpu/drm/i915/intel_sideband.c              |    4 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  101 +-
 drivers/gpu/drm/i915/intel_uncore.h                |   30 +-
 drivers/gpu/drm/i915/intel_wakeref.c               |   80 +-
 drivers/gpu/drm/i915/intel_wakeref.h               |   73 +-
 drivers/gpu/drm/i915/intel_wopcm.c                 |  270 +++--
 drivers/gpu/drm/i915/intel_wopcm.h                 |   20 +-
 drivers/gpu/drm/i915/oa/Makefile                   |    7 +
 drivers/gpu/drm/i915/oa/i915_oa_bdw.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_bdw.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_bxt.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_bxt.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_chv.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_chv.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_cnl.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_cnl.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_glk.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_glk.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_hsw.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_hsw.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_icl.c              |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_icl.h              |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h           |    7 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c           |   35 +-
 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h           |    7 +-
 drivers/gpu/drm/i915/selftests/i915_active.c       |    3 +-
 drivers/gpu/drm/i915/selftests/i915_buddy.c        |  720 +++++++++++++
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |   19 +-
 .../gpu/drm/i915/selftests/i915_live_selftests.h   |    6 +-
 .../gpu/drm/i915/selftests/i915_mock_selftests.h   |    1 +
 drivers/gpu/drm/i915/selftests/i915_request.c      |   46 +-
 drivers/gpu/drm/i915/selftests/i915_selftest.c     |    2 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.c       |   30 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.h       |    6 +-
 drivers/gpu/drm/i915/selftests/lib_sw_fence.c      |    1 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |    1 +
 drivers/gpu/drm/i915/selftests/mock_request.c      |    6 +-
 drivers/gpu/drm/i915/selftests/mock_request.h      |    4 +-
 include/drm/i915_pciids.h                          |    5 +-
 288 files changed, 11449 insertions(+), 7386 deletions(-)
 rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%)
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool_types.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_context.c
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.c
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_pm.c
 create mode 100644 drivers/gpu/drm/i915/i915_buddy.c
 create mode 100644 drivers/gpu/drm/i915/i915_buddy.h
 delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c
 delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h
 create mode 100644 drivers/gpu/drm/i915/i915_getparam.c
 create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h
 create mode 100644 drivers/gpu/drm/i915/i915_perf.h
 create mode 100644 drivers/gpu/drm/i915/i915_suspend.h
 create mode 100644 drivers/gpu/drm/i915/i915_sw_fence_work.c
 create mode 100644 drivers/gpu/drm/i915/i915_sw_fence_work.h
 create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h
 create mode 100644 drivers/gpu/drm/i915/i915_utils.c
 create mode 100644 drivers/gpu/drm/i915/intel_pch.c
 create mode 100644 drivers/gpu/drm/i915/intel_pch.h
 create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pool.c b/drivers/gpu/drm/i915/gt/intel_engine_pool.c
index 03d90b49584a..4cd54c569911 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pool.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pool.c
@@ -43,12 +43,12 @@  static int pool_active(struct i915_active *ref)
 {
        struct intel_engine_pool_node *node =
                container_of(ref, typeof(*node), active);
-       struct reservation_object *resv = node->obj->base.resv;
+       struct dma_resv *resv = node->obj->base.resv;
        int err;

-       if (reservation_object_trylock(resv)) {
-               reservation_object_add_excl_fence(resv, NULL);
-               reservation_object_unlock(resv);
+       if (dma_resv_trylock(resv)) {
+               dma_resv_add_excl_fence(resv, NULL);
+               dma_resv_unlock(resv);
        }

        err = i915_gem_object_pin_pages(node->obj);