Commit e7a09cea authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2022-02-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Cross-subsystem Changes:
------------------------

dma-buf:
- dma-buf-map: Rename to iosys-map (Lucas)

Core Changes:
-------------

drm:
- Always include the debugfs_entry in drm_crtc (Ville)
- Add orientation quirk for GPD Win Max (Anisse)

Driver Changes:
---------------

gvt:
- Constify some pointers. (Rikard Falkeborn)
- Use list_entry to access list members. (Guenter Roeck)
- Fix cmd parser error for Passmark9. (Zhenyu Wang)

i915:
- Various clean-ups including headers and removing unused and unnecessary stuff\
 (Jani, Hans, Andy, Ville)
- Cleaning up on our registers definitions i915_reg.h (Matt)
- More multi-FBC refactoring (Ville)
- Baytrail backlight fix (Hans)
- DG1 OPROM read through SPI controller (Clint)
- ADL-N platform enabling (Tejas)
- Fix slab-out-of-bounds access (Jani)
- Add opregion mailbox #5 support for possible EDID override (Anisse)
- Fix possible NULL dereferences (Harish)
- Updates and fixes around display voltage swing values (Clint, Jose)
- Fix RPM wekeref on PXP code (Juston)
- Many register definitions clean-up, including planes registers (Ville)
- More conversion towards display version over the old gen (Madhumitha, Ville)
- DP MST ESI handling improvements (Jani)
- drm device based logging conversions (Jani)
- Prevent divide by zero (Dan)
- Introduce ilk_pch_pre_enable for complete modeset abstraction (Ville)
- Async flip optimization for DG2 (Stanislav)
- Multiple DSC and bigjoiner fixes and improvements (Ville)
- Fix ADL-P TypeC Phy ready status readout (Imre)
- Fix up DP DFP 4:2:0 handling more display related fixes (Ville)
- Display M/N cleanup (Ville)
- Switch to use VGA definitions from video/vga.h (Jani)
- Fixes and improvements to abstract CPU architecture (Lucas)
- Disable unsused power wells left enabled by BIOS (Imre)
- Allow !join_mbus cases for adlp+ dbuf configuration (Ville)
- Populate pipe dbuf slices more accurately during readout (Ville)
- Workaround broken BIOS DBUF configuration on TGL/RKL (Ville)
- Fix trailing semicolon (Lucas)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YgKFLmCgpv4vQEa1@intel.com
parents 53dbee49 7938f421

Documentation/driver-api/device-io.rst

+9 −0
Original line number Diff line number Diff line
@@ -502,6 +502,15 @@ pcim_iomap() 
Not using these wrappers may make drivers unusable on certain platforms with

stricter rules for mapping I/O memory.



Generalizing Access to System and I/O Memory

============================================



.. kernel-doc:: include/linux/iosys-map.h

   :doc: overview



.. kernel-doc:: include/linux/iosys-map.h

   :internal:



Public Functions Provided

=========================

Documentation/driver-api/dma-buf.rst

+0 −9
Original line number Diff line number Diff line
@@ -128,15 +128,6 @@ Kernel Functions and Structures Reference 
.. kernel-doc:: include/linux/dma-buf.h

   :internal:



Buffer Mapping Helpers

~~~~~~~~~~~~~~~~~~~~~~



.. kernel-doc:: include/linux/dma-buf-map.h

   :doc: overview



.. kernel-doc:: include/linux/dma-buf-map.h

   :internal:



Reservation Objects

-------------------

Documentation/gpu/todo.rst

+10 −10
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ Convert drivers to use drm_fbdev_generic_setup() 
Most drivers can use drm_fbdev_generic_setup(). Driver have to implement

atomic modesetting and GEM vmap support. Historically, generic fbdev emulation

expected the framebuffer in system memory or system-like memory. By employing

struct dma_buf_map, drivers with frambuffers in I/O memory can be supported

struct iosys_map, drivers with frambuffers in I/O memory can be supported

as well.



Contact: Maintainer of the driver you plan to convert
@@ -234,7 +234,7 @@ Reimplement functions in drm_fbdev_fb_ops without fbdev 


A number of callback functions in drm_fbdev_fb_ops could benefit from

being rewritten without dependencies on the fbdev module. Some of the

helpers could further benefit from using struct dma_buf_map instead of

helpers could further benefit from using struct iosys_map instead of

raw pointers.



Contact: Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter
@@ -434,19 +434,19 @@ Contact: Emil Velikov, respective driver maintainers 


Level: Intermediate



Use struct dma_buf_map throughout codebase

------------------------------------------

Use struct iosys_map throughout codebase

----------------------------------------



Pointers to shared device memory are stored in struct dma_buf_map. Each

Pointers to shared device memory are stored in struct iosys_map. Each

instance knows whether it refers to system or I/O memory. Most of the DRM-wide

interface have been converted to use struct dma_buf_map, but implementations

interface have been converted to use struct iosys_map, but implementations

often still use raw pointers.



The task is to use struct dma_buf_map where it makes sense.

The task is to use struct iosys_map where it makes sense.



* Memory managers should use struct dma_buf_map for dma-buf-imported buffers.

* TTM might benefit from using struct dma_buf_map internally.

* Framebuffer copying and blitting helpers should operate on struct dma_buf_map.

* Memory managers should use struct iosys_map for dma-buf-imported buffers.

* TTM might benefit from using struct iosys_map internally.

* Framebuffer copying and blitting helpers should operate on struct iosys_map.



Contact: Thomas Zimmermann <tzimmermann@suse.de>, Christian König, Daniel Vetter

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -5734,7 +5734,7 @@ T: git git://anongit.freedesktop.org/drm/drm-misc 
F:	Documentation/driver-api/dma-buf.rst

F:	drivers/dma-buf/

F:	include/linux/*fence.h

F:	include/linux/dma-buf*

F:	include/linux/dma-buf.h

F:	include/linux/dma-resv.h

K:	\bdma_(?:buf|fence|resv)\b








@@ -10050,6 +10050,13 @@ F:	include/linux/iova.h







F:	include/linux/of_iommu.h









F:	include/uapi/linux/iommu.h

















IOSYS-MAP HELPERS









M:	Thomas Zimmermann <tzimmermann@suse.de>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc









F:	include/linux/iosys-map.h

















IO_URING









M:	Jens Axboe <axboe@kernel.dk>









R:	Pavel Begunkov <asml.silence@gmail.com>
































arch/x86/kernel/early-quirks.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -555,6 +555,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {







	INTEL_RKL_IDS(&gen11_early_ops),









	INTEL_ADLS_IDS(&gen11_early_ops),









	INTEL_ADLP_IDS(&gen11_early_ops),









	INTEL_ADLN_IDS(&gen11_early_ops),









	INTEL_RPLS_IDS(&gen11_early_ops),









};