Commit 8284bae7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-next-2022-08-20-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v6.1:

UAPI Changes:

Cross-subsystem Changes:
- DMA-buf: documentation updates.
- Assorted small fixes to vga16fb
- Fix fbdev drivers to use the aperture helpers.
- Make removal of conflicting drivers work correctly without fbdev enabled.

Core Changes:
- bridge, scheduler, dp-mst: Assorted small fixes.
- Add more format helpers to fourcc, and use it to replace the cpp usage.
- Add DRM_FORMAT_Cxx, DRM_FORMAT_Rxx (single channel), and DRM_FORMAT_Dxx
  ("darkness", inverted single channel)
- Add packed AYUV8888 and XYUV8888 formats.
- Assorted documentation updates.
- Rename ttm_bo_init to ttm_bo_init_validate.
- Allow TTM bo's to exist without backing store.
- Convert drm selftests to kunit.
- Add managed init functions for (panel) bridge, crtc, encoder and connector.
- Fix endianness handling in various format conversion helpers.
- Make tests pass on big-endian platforms, and add test for rgb888 -> rgb565
- Move DRM_PLANE_HELPER_NO_SCALING to atomic helpers and rename, so
  drm_plane_helper is no longer needed in most drivers.
- Use idr_init_base instead of idr_init.
- Rename FB and GEM CMA helpers to DMA helpers.
- Rework XRGB8888 related conversion helpers, and add drm_fb_blit() that
  takes a iosys_map. Make drm_fb_memcpy take an iosys_map too.
- Move edid luminance calculation to core, and use it in i915.

Driver Changes:
- bridge/{adv7511,ti-sn65dsi86,parade-ps8640}, panel/{simple,nt35510,tc358767},
  nouveau, sun4i, mipi-dsi, mgag200, bochs, arm, komeda, vmwgfx, pl111:
  Assorted small fixes and doc updates.
- vc4: Rework hdmi power up, and depend on PM.
- panel/simple: Add Samsung LTL101AL01.
- ingenic: Add JZ4760(B) support, avoid a modeset when sharpness property
  is unchanged, and use the new PM ops.
- Revert some amdgpu commits that cause garbaged graphics when starting
  X, and reapply them with the real problem fixed.
- Completely rework vc4 init to use managed helpers.
- Rename via_drv to via_dri1, and move all stuff there only used by the
  dri1 implementation in preperation for atomic modeset.
- Use regmap bulk write in ssd130x.
- Power sequence and clock updates to it6505.
- Split panel-sitrox-st7701  init sequence and rework mode programming code.
- virtio: Improve error and edge conditions handling, and convert to use managed
  helpers.
- Add Samsung LTL101AL01, B120XAN01.0, R140NWF5 RH, DMT028VGHMCMI-1A T, panels.
- Add generic fbdev support to komeda.
- Split mgag200 modeset handling to make it more model-specific.
- Convert simpledrm to use atomic helpers.
- Improve udl suspend/disconnect handling.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f0c71766-61e8-19b7-763a-5fbcdefc633d@linux.intel.com
parents 2c2d7a67 8869fa66

Documentation/devicetree/bindings/display/ingenic,lcd.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ properties: 
    enum:

      - ingenic,jz4740-lcd

      - ingenic,jz4725b-lcd

      - ingenic,jz4760-lcd

      - ingenic,jz4760b-lcd

      - ingenic,jz4770-lcd

      - ingenic,jz4780-lcd

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ properties: 
      - samsung,atna33xc20

        # Samsung 12.2" (2560x1600 pixels) TFT LCD panel

      - samsung,lsn122dl01-c01

        # Samsung Electronics 10.1" WXGA (1280x800) TFT LCD panel

      - samsung,ltl101al01

        # Samsung Electronics 10.1" WSVGA TFT LCD panel

      - samsung,ltn101nt05

        # Samsung Electronics 14" WXGA (1366x768) TFT LCD panel

Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ description: | 
  Techstar TS8550B is 480x854, 2-lane MIPI DSI LCD panel which has

  inbuilt ST7701 chip.



  Densitron DMT028VGHMCMI-1A is 480x640, 2-lane MIPI DSI LCD panel

  which has built-in ST7701 chip.



allOf:

  - $ref: panel-common.yaml#
@@ -24,6 +27,7 @@ properties: 
  compatible:

    items:

      - enum:

          - densitron,dmt028vghmcmi-1a

          - techstar,ts8550b

      - const: sitronix,st7701

Documentation/gpu/drm-kms-helpers.rst

+4 −4
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ format Helper Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_format_helper.c

   :export:



Framebuffer CMA Helper Functions Reference

Framebuffer DMA Helper Functions Reference

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



.. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c

   :doc: framebuffer cma helper functions

.. kernel-doc:: drivers/gpu/drm/drm_fb_dma_helper.c

   :doc: framebuffer dma helper functions



.. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c

.. kernel-doc:: drivers/gpu/drm/drm_fb_dma_helper.c

   :export:



Framebuffer GEM Helper Reference

Documentation/gpu/drm-mm.rst

+8 −8
Original line number Diff line number Diff line
@@ -300,12 +300,12 @@ Drivers that want to map the GEM object upfront instead of handling page 
faults can implement their own mmap file operation handler.



For platforms without MMU the GEM core provides a helper method

drm_gem_cma_get_unmapped_area(). The mmap() routines will call this to get a

drm_gem_dma_get_unmapped_area(). The mmap() routines will call this to get a

proposed address for the mapping.



To use drm_gem_cma_get_unmapped_area(), drivers must fill the struct

To use drm_gem_dma_get_unmapped_area(), drivers must fill the struct

:c:type:`struct file_operations <file_operations>` get_unmapped_area field with

a pointer on drm_gem_cma_get_unmapped_area().

a pointer on drm_gem_dma_get_unmapped_area().



More detailed information about get_unmapped_area can be found in

Documentation/admin-guide/mm/nommu-mmap.rst
@@ -355,16 +355,16 @@ GEM Function Reference 
.. kernel-doc:: drivers/gpu/drm/drm_gem.c

   :export:



GEM CMA Helper Functions Reference

GEM DMA Helper Functions Reference

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



.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c

   :doc: cma helpers

.. kernel-doc:: drivers/gpu/drm/drm_gem_dma_helper.c

   :doc: dma helpers



.. kernel-doc:: include/drm/drm_gem_cma_helper.h

.. kernel-doc:: include/drm/drm_gem_dma_helper.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c

.. kernel-doc:: drivers/gpu/drm/drm_gem_dma_helper.c

   :export:



GEM SHMEM Helper Function Reference