From: Dave Airlie Date: Fri, 29 Jan 2021 07:04:36 +0000 (+1000) Subject: Merge tag 'drm-intel-next-2021-01-27' of git://anongit.freedesktop.org/drm/drm-intel... X-Git-Tag: baikal/aarch64/sdk6.1~7223^2~10 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=cabb881d4691ffc4f9f28979942efcaf3e436ba1;p=kernel.git Merge tag 'drm-intel-next-2021-01-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next - HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (Anshuman) - Fix DP vswing settings and handling (Imre, Ville) - Various display code clean-up (Jani, Ville) - Various display refactoring, including split out of pps, aux, and fdi (Ja\ ni, Dave) - Add DG1 missing workarounds (Jose) - Fix display color conversion (Chris, Ville) - Try to guess PCH type even without ISA bridge (Zhenyu) - More backlight refactor (Lyude) - Support two CSC module on gen11 and later (Lee) - Async flips for all ilk+ platforms (Ville) - Clear color support for TGL (RK) - Add a helper to read data from a GEM object page (Imre) - VRR/Adaptive Sync Enabling on DP/eDP for TGL+ (Manasi, Ville Aditya) Signed-off-by: Dave Airlie From: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20210127140822.GA711686@intel.com --- cabb881d4691ffc4f9f28979942efcaf3e436ba1 diff --cc drivers/gpu/drm/i915/gem/i915_gem_object.h index 5274e9d139b4d,ae83737f1d48f..d0ae834d787af --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@@ -548,6 -546,6 +554,8 @@@ i915_gem_object_invalidate_frontbuffer( __i915_gem_object_invalidate_frontbuffer(obj, origin); } + int i915_gem_object_read_from_page(struct drm_i915_gem_object *obj, u64 offset, void *dst, int size); + +bool i915_gem_object_is_shmem(const struct drm_i915_gem_object *obj); + #endif