Commit 6716101a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next



Backmerge fixes from v7.0-rc2 into drm-misc-next.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents ad595a8a 17b95278
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -210,7 +210,12 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linaro.org>
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@free.fr>
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linexp.org>
Daniel Lezcano <daniel.lezcano@kernel.org> <dlezcano@fr.ibm.com>
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@intel.com>
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
David Brownell <david-b@pacbell.net>
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -876,6 +881,7 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
Vlastimil Babka <vbabka@kernel.org> <vbabka@suse.cz>
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
@@ -890,7 +896,8 @@ Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
Yosry Ahmed <yosry@kernel.org> <yosryahmed@google.com>
Yosry Ahmed <yosry@kernel.org> <yosry.ahmed@linux.dev>
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
Yusuke Goda <goda.yusuke@renesas.com>
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
+31 −0
Original line number Diff line number Diff line
@@ -129,6 +129,37 @@ Description:
			-EIO if FW refuses to change the provisioning.


What:		/sys/bus/pci/drivers/xe/.../sriov_admin/.bulk_profile/vram_quota
What:		/sys/bus/pci/drivers/xe/.../sriov_admin/vf<n>/profile/vram_quota
Date:		February 2026
KernelVersion:	7.0
Contact:	intel-xe@lists.freedesktop.org
Description:
		These files allow to perform initial VFs VRAM provisioning prior to VFs
		enabling or to change VFs VRAM provisioning once the VFs are enabled.
		Any non-zero initial VRAM provisioning will block VFs auto-provisioning.
		Without initial VRAM provisioning those files will show result of the
		VRAM auto-provisioning performed by the PF once the VFs are enabled.
		Once the VFs are disabled, all VRAM provisioning will be released.
		These files are visible only on discrete Intel Xe platforms with VRAM
		and are writeable only if dynamic VFs VRAM provisioning is supported.

		.bulk_profile/vram_quota: (WO) unsigned integer
			The amount of the provisioned VRAM in [bytes] for each VF.
			Actual quota value might be aligned per HW/FW requirements.

		profile/vram_quota: (RW) unsigned integer
			The amount of the provisioned VRAM in [bytes] for this VF.
			Actual quota value might be aligned per HW/FW requirements.

			Default is 0 (unprovisioned).

		Writes to these attributes may fail with errors like:
			-EINVAL if provided input is malformed or not recognized,
			-EPERM if change is not applicable on given HW/FW,
			-EIO if FW refuses to change the provisioning.


What:		/sys/bus/pci/drivers/xe/.../sriov_admin/vf<n>/stop
Date:		October 2025
KernelVersion:	6.19
+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,9 @@ Values:
	  their sockets will only be able to connect within their own
	  namespace.

The first write to ``child_ns_mode`` locks its value. Subsequent writes of the
same value succeed, but writing a different value returns ``-EBUSY``.

Changing ``child_ns_mode`` only affects namespaces created after the change;
it does not modify the current namespace or any existing children.

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ examples:
          regulator-max-microvolt = <1700000>;
        };
        mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {
          regulator-name = "vrfck";
          regulator-name = "vrfck_1";
          regulator-min-microvolt = <1240000>;
          regulator-max-microvolt = <1600000>;
        };
@@ -309,7 +309,7 @@ examples:
          regulator-max-microvolt = <3300000>;
        };
        mt6359_vemc_1_ldo_reg: ldo_vemc_1 {
          regulator-name = "vemc";
          regulator-name = "vemc_1";
          regulator-min-microvolt = <2500000>;
          regulator-max-microvolt = <3300000>;
        };
+1 −30
Original line number Diff line number Diff line
@@ -22,21 +22,6 @@ allOf:
      properties:
        reg:
          minItems: 2
  - if:
      properties:
        compatible:
          contains:
            enum:
              - baikal,bt1-sys-ssi
    then:
      properties:
        mux-controls:
          maxItems: 1
      required:
        - mux-controls
    else:
      required:
        - interrupts
  - if:
      properties:
        compatible:
@@ -75,10 +60,6 @@ properties:
        const: intel,mountevans-imc-ssi
      - description: AMD Pensando Elba SoC SPI Controller
        const: amd,pensando-elba-spi
      - description: Baikal-T1 SPI Controller
        const: baikal,bt1-ssi
      - description: Baikal-T1 System Boot SPI Controller
        const: baikal,bt1-sys-ssi
      - description: Canaan Kendryte K210 SoS SPI Controller
        const: canaan,k210-spi
      - description: Renesas RZ/N1 SPI Controller
@@ -170,6 +151,7 @@ required:
  - "#address-cells"
  - "#size-cells"
  - clocks
  - interrupts

examples:
  - |
@@ -190,15 +172,4 @@ examples:
        rx-sample-delay-ns = <7>;
      };
    };
  - |
    spi@1f040100 {
      compatible = "baikal,bt1-sys-ssi";
      reg = <0x1f040100 0x900>,
            <0x1c000000 0x1000000>;
      #address-cells = <1>;
      #size-cells = <0>;
      mux-controls = <&boot_mux>;
      clocks = <&ccu_sys>;
      clock-names = "ssi_clk";
    };
...
Loading