Commit 907cc346 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2022-09-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 6.1:

UAPI Changes:

Cross-subsystem Changes:
  - dma-buf: Improve signaling when debugging

Core Changes:
  - Backlight handling improvements
  - format-helper: Add drm_fb_build_fourcc_list()
  - fourcc: Kunit tests improvements
  - modes: Add DRM_MODE_INIT() macro
  - plane: Remove drm_plane_init(), Allocate planes with drm_universal_plane_alloc()
  - plane-helper: Add drm_plane_helper_atomic_check()
  - probe-helper: Add drm_connector_helper_get_modes_fixed() and
    drm_crtc_helper_mode_valid_fixed()
  - tests: Conversion to parametrized tests, test name consistency

Driver Changes:
  - amdgpu: Fix for a VRAM eviction issue
  - ast: Resolution handling improvements
  - mediatek: small code improvements for DP
  - omap: Refcounting fix, small improvements
  - rockchip: RK3568 support, Gamma support for RK3399
  - sun4i: Build failure fix when !OF
  - udl: Multiple fixes here and there
  - vc4: HDMI hotplug handling improvements
  - vkms: Warning fix

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220923073943.d43tne5hni3iknlv@houat
parents 95d8c671 39dd0cc2

Documentation/devicetree/bindings/display/bridge/chrontel,ch7033.yaml

+0 −13
Original line number Diff line number Diff line
@@ -14,19 +14,6 @@ properties: 
  compatible:

    const: chrontel,ch7033



  chrontel,byteswap:

    $ref: /schemas/types.yaml#/definitions/uint8

    enum:

      - 0  # BYTE_SWAP_RGB

      - 1  # BYTE_SWAP_RBG

      - 2  # BYTE_SWAP_GRB

      - 3  # BYTE_SWAP_GBR

      - 4  # BYTE_SWAP_BRG

      - 5  # BYTE_SWAP_BGR

    description: |

      Set the byteswap value of the bridge. This is optional and if not

      set value of BYTE_SWAP_BGR is used.



  reg:

    maxItems: 1

    description: I2C address of the device

Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
	"rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi"

	"rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi"

	"rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"

	"rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi"

- reg: Represent the physical address range of the controller.

- interrupts: Represent the controller's interrupt to the CPU(s).

- clocks, clock-names: Phandles to the controller's pll reference

Documentation/gpu/todo.rst

+68 −0
Original line number Diff line number Diff line
@@ -679,6 +679,74 @@ Contact: Sam Ravnborg 


Level: Advanced



Brightness handling on devices with multiple internal panels

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



On x86/ACPI devices there can be multiple backlight firmware interfaces:

(ACPI) video, vendor specific and others. As well as direct/native (PWM)

register programming by the KMS driver.



To deal with this backlight drivers used on x86/ACPI call

acpi_video_get_backlight_type() which has heuristics (+quirks) to select

which backlight interface to use; and backlight drivers which do not match

the returned type will not register themselves, so that only one backlight

device gets registered (in a single GPU setup, see below).



At the moment this more or less assumes that there will only

be 1 (internal) panel on a system.



On systems with 2 panels this may be a problem, depending on

what interface acpi_video_get_backlight_type() selects:



1. native: in this case the KMS driver is expected to know which backlight

   device belongs to which output so everything should just work.

2. video: this does support controlling multiple backlights, but some work

   will need to be done to get the output <-> backlight device mapping



The above assumes both panels will require the same backlight interface type.

Things will break on systems with multiple panels where the 2 panels need

a different type of control. E.g. one panel needs ACPI video backlight control,

where as the other is using native backlight control. Currently in this case

only one of the 2 required backlight devices will get registered, based on

the acpi_video_get_backlight_type() return value.



If this (theoretical) case ever shows up, then supporting this will need some

work. A possible solution here would be to pass a device and connector-name

to acpi_video_get_backlight_type() so that it can deal with this.



Note in a way we already have a case where userspace sees 2 panels,

in dual GPU laptop setups with a mux. On those systems we may see

either 2 native backlight devices; or 2 native backlight devices.



Userspace already has code to deal with this by detecting if the related

panel is active (iow which way the mux between the GPU and the panels

points) and then uses that backlight device. Userspace here very much

assumes a single panel though. It picks only 1 of the 2 backlight devices

and then only uses that one.



Note that all userspace code (that I know off) is currently hardcoded

to assume a single panel.



Before the recent changes to not register multiple (e.g. video + native)

/sys/class/backlight devices for a single panel (on a single GPU laptop),

userspace would see multiple backlight devices all controlling the same

backlight.



To deal with this userspace had to always picks one preferred device under

/sys/class/backlight and will ignore the others. So to support brightness

control on multiple panels userspace will need to be updated too.



There are plans to allow brightness control through the KMS API by adding

a "display brightness" property to drm_connector objects for panels. This

solves a number of issues with the /sys/class/backlight API, including not

being able to map a sysfs backlight device to a specific connector. Any

userspace changes to add support for brightness control on devices with

multiple panels really should build on top of this new KMS property.



Contact: Hans de Goede



Level: Advanced



Outside DRM

===========

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14532,6 +14532,7 @@ M: Daniel Dadap <ddadap@nvidia.com> 
L:	platform-driver-x86@vger.kernel.org

S:	Supported

F:	drivers/platform/x86/nvidia-wmi-ec-backlight.c

F:	include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h









NVM EXPRESS DRIVER









M:	Keith Busch <kbusch@kernel.org>
































drivers/acpi/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -212,6 +212,7 @@ config ACPI_VIDEO







	tristate "Video"









	depends on BACKLIGHT_CLASS_DEVICE









	depends on INPUT









	depends on ACPI_WMI || !X86









	select THERMAL









	help









	  This driver implements the ACPI Extensions For Display Adapters