From: Dave Airlie Date: Tue, 20 Sep 2022 21:46:54 +0000 (+1000) Subject: Merge tag 'drm-intel-next-2022-09-16-1' of git://anongit.freedesktop.org/drm/drm... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47cd3af67de0bef9d50e37197dc307ce83768142;p=linux.git Merge tag 'drm-intel-next-2022-09-16-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next drm/i915 feature pull #2 for v6.1: Features and functionality: - More Meteorlake platform enabling (Radhakrishna, Imre, Madhumitha) - Allow seamless M/N changes on eDP panels that support it (Ville) - Switch DSC debugfs from output bpp to input bpc (Swati) Refactoring and cleanups: - Clocking and DPLL refactoring and cleanups to support seamless M/N (Ville) - Plenty of VBT definition and parsing updates and cleanups (Ville) - Extract SKL watermark code to a separate file, and clean up (Ville) - Clean up IPC interfaces and debugfs (Jani) - Continue moving display data under drm_i915_private display sub-struct (Jani) - Display quirk handling refactoring and abstractions (Jani) - Stop using implicit dev_priv in gmbus registers (Jani) - BUG_ON() removals and conversions to drm_WARN_ON() and BUILD_BUG_ON() (Jani) - Use drm_dp_phy_name() for logging (Jani) - Use REG_BIT() macros for CDCLK registers (Stan) - Move display and media IP versions to runtime info (Radhakrishna) Fixes: - Fix DP MST suspend to avoid use-after-free (Andrzej) - Fix HPD suspend to avoid use-after-free for fbdev (Andrzej) - Fix various PSR issues regarding selective update and damage clips (Jouni) - Fix runtime pm wakerefs for driver remove and release (Mitul Golani) - Fix conditions for filtering fixed modes for panels (Ville) - Fix TV encoder clock computation (Ville) - Fix dvo mode_valid hook return type (Nathan Huckleberry) Merges: - Backmerge drm-next to sync the DP MST atomic changes (Jani) Signed-off-by: Dave Airlie From: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/87o7vfr064.fsf@intel.com --- 47cd3af67de0bef9d50e37197dc307ce83768142 diff --cc drivers/gpu/drm/i915/i915_gem.h index 68d8d52bd541d,2fccb19ed9f79..a5cdf6662d01d --- a/drivers/gpu/drm/i915/i915_gem.h +++ b/drivers/gpu/drm/i915/i915_gem.h @@@ -31,7 -32,49 +32,49 @@@ #include "i915_utils.h" + struct drm_file; + struct drm_i915_gem_object; struct drm_i915_private; + struct i915_gem_ww_ctx; -struct i915_ggtt_view; ++struct i915_gtt_view; + struct i915_vma; + + void i915_gem_init_early(struct drm_i915_private *i915); + void i915_gem_cleanup_early(struct drm_i915_private *i915); + + void i915_gem_drain_freed_objects(struct drm_i915_private *i915); + void i915_gem_drain_workqueue(struct drm_i915_private *i915); + + struct i915_vma * __must_check + i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww, - const struct i915_ggtt_view *view, ++ const struct i915_gtt_view *view, + u64 size, u64 alignment, u64 flags); + + struct i915_vma * __must_check + i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, - const struct i915_ggtt_view *view, ++ const struct i915_gtt_view *view, + u64 size, u64 alignment, u64 flags); + + int i915_gem_object_unbind(struct drm_i915_gem_object *obj, + unsigned long flags); + #define I915_GEM_OBJECT_UNBIND_ACTIVE BIT(0) + #define I915_GEM_OBJECT_UNBIND_BARRIER BIT(1) + #define I915_GEM_OBJECT_UNBIND_TEST BIT(2) + #define I915_GEM_OBJECT_UNBIND_VM_TRYLOCK BIT(3) + #define I915_GEM_OBJECT_UNBIND_ASYNC BIT(4) + + void i915_gem_runtime_suspend(struct drm_i915_private *i915); + + int __must_check i915_gem_init(struct drm_i915_private *i915); + void i915_gem_driver_register(struct drm_i915_private *i915); + void i915_gem_driver_unregister(struct drm_i915_private *i915); + void i915_gem_driver_remove(struct drm_i915_private *i915); + void i915_gem_driver_release(struct drm_i915_private *i915); + + int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file); + + /* FIXME: All of the below belong somewhere else. */ #ifdef CONFIG_DRM_I915_DEBUG_GEM diff --cc drivers/gpu/drm/i915/i915_pci.c index 19fc00bcd7b9b,1576cbcf22543..77e7df21f539b --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@@ -1136,12 -1122,11 +1136,12 @@@ static const struct intel_device_info m * Real graphics IP version will be obtained from hardware GMD_ID * register. Value provided here is just for sanity checking. */ - .__runtime.graphics.ver = 12, - .__runtime.graphics.rel = 70, - .media.ver = 13, + .__runtime.graphics.ip.ver = 12, + .__runtime.graphics.ip.rel = 70, + .__runtime.media.ip.ver = 13, PLATFORM(INTEL_METEORLAKE), .display.has_modular_fia = 1, + .extra_gt_list = xelpmp_extra_gt, .has_flat_ccs = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,