Commit 9ac4beb7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2024-02-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v6.9:

UAPI Changes:

Cross-subsystem Changes:

arch:
- powerpc/ps3: select CONFIG_VIDEO

Core Changes:

ci:
- msm: fix apq8016 runner

display:
- use newer DRM print helpers

documentation:
- fix typos

print:
- add device-specific error and debug printers

sysfb:
- set Linux parent device for firmware framebuffer

tests:
- mm: use newer DRM print helpers

Driver Changes:

bridge:
- switch to ->read_edid callback throughout the bridge
drivers
- remove old ->get_edid callback

i915:
- use newer DRM print helpers

lima:
- improve stability by fixes to error handling and recovery

mediathek:
- switch to ->read_edid callback

msm:
- switch to ->read_edid callback

omap:
- switch to ->read_edid callback

panel:
- add Powkiddy RGB10MAX3 plus DT bindings
- st7703: support panel rotation plus DT bindings

rockchip:
- DT bindings: remove port, add power-domains

xe:
- use newer DRM print helpers

xlnx:
- switch to ->read_edid callback

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

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmXOD/oACgkQaA3BHVML
# eiMWMAgArTVXF4UQ+FUxYZB5QTm2veYIpilvwmzaQLNxsM9SsWpzwMIVAi+xf93g
# uqUqkl6QvZ9pJg6bxuXRNcJw/GObIO4x6tn+LkbccczgHiHwvn6ydNdUoMx8ulne
# EsGC0z8bb5Gpwh9b/pnBul2AoIE7PHAJltgH271/O2xnhFMUbchQ0ckHvWnn8/GA
# Nef145ySX4gkYtY8u2TRr4r6Bkp7Tpiyv6ipU7Cpu7KqyveTDMx3c9r5FaiHnJT/
# Hx/5s87q0Bx2m+iNjlBLJzYjF2UWth+pbfiu3xwyWOE7hdkPLwCQ5mqHWcFFqxfb
# Vuj9jP+Vb68L7EvGpq2LArLdhZjHIQ==
# =SsjX
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 15 Feb 2024 23:22:02 AEST
# gpg:                using RSA key 7217FBAC8CE9CF6344A168E5680DC11D530B7A23
# gpg: Can't check signature: No public key
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240215132610.GA1464@localhost.localdomain
parents 6f167a36 aa1267e6

Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ properties: 
    enum:

      # Anberic RG353V-V2 5.0" 640x480 TFT LCD panel

      - anbernic,rg353v-panel-v2

      # Powkiddy RGB10MAX3 5.0" 720x1280 TFT LCD panel

      - powkiddy,rgb10max3-panel

      # Powkiddy RGB30 3.0" 720x720 TFT LCD panel

      - powkiddy,rgb30-panel

      # Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel
@@ -43,6 +45,7 @@ properties: 
  reset-gpios: true



  backlight: true

  rotation: true



required:

  - compatible

Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml

+27 −6
Original line number Diff line number Diff line
@@ -94,11 +94,14 @@ properties: 
      - const: default

      - const: unwedge



  power-domains:

    maxItems: 1



  ports:

    $ref: /schemas/graph.yaml#/properties/ports



    patternProperties:

      "^port(@0)?$":

    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description: Input of the DWC HDMI TX

        properties:
@@ -108,11 +111,14 @@ properties: 
            description: Connection to the VOPB

          endpoint@1:

            description: Connection to the VOPL

    properties:

      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description: Output of the DWC HDMI TX



    required:

      - port@0

      - port@1



  rockchip,grf:

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

    description:
@@ -135,19 +141,25 @@ examples: 
    #include <dt-bindings/clock/rk3288-cru.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/power/rk3288-power.h>



    hdmi: hdmi@ff980000 {

        compatible = "rockchip,rk3288-dw-hdmi";

        reg = <0xff980000 0x20000>;

        reg-io-width = <4>;

        ddc-i2c-bus = <&i2c5>;

        rockchip,grf = <&grf>;

        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;

        clock-names = "iahb", "isfr";

        ddc-i2c-bus = <&i2c5>;

        power-domains = <&power RK3288_PD_VIO>;

        rockchip,grf = <&grf>;



        ports {

            port {

            #address-cells = <1>;

            #size-cells = <0>;



            port@0 {

                reg = <0>;

                #address-cells = <1>;

                #size-cells = <0>;
@@ -155,11 +167,20 @@ examples: 
                    reg = <0>;

                    remote-endpoint = <&vopb_out_hdmi>;

                };



                hdmi_in_vopl: endpoint@1 {

                    reg = <1>;

                    remote-endpoint = <&vopl_out_hdmi>;

                };

            };



            port@1 {

                reg = <1>;



                hdmi_out_con: endpoint {

                    remote-endpoint = <&hdmi_con_in>;

                };

            };

        };

    };

arch/powerpc/platforms/ps3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config PS3_VUART 
config PS3_PS3AV

	depends on PPC_PS3

	tristate "PS3 AV settings driver" if PS3_ADVANCED

	select VIDEO

	select PS3_VUART

	default y

	help

drivers/firmware/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ config MTK_ADSP_IPC 
config SYSFB

	bool

	select BOOT_VESA_SUPPORT

	select SCREEN_INFO



config SYSFB_SIMPLEFB

	bool "Mark VGA/VBE/EFI FB as generic system framebuffer"

drivers/firmware/sysfb.c

+50 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/pci.h>

#include <linux/platform_data/simplefb.h>

#include <linux/platform_device.h>

#include <linux/screen_info.h>
@@ -69,24 +70,70 @@ void sysfb_disable(void) 
}

EXPORT_SYMBOL_GPL(sysfb_disable);



#if defined(CONFIG_PCI)

static __init bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)

{

	/*

	 * TODO: Try to integrate this code into the PCI subsystem

	 */

	int ret;

	u16 command;



	ret = pci_read_config_word(pdev, PCI_COMMAND, &command);

	if (ret != PCIBIOS_SUCCESSFUL)

		return false;

	if (!(command & PCI_COMMAND_MEMORY))

		return false;

	return true;

}

#else

static __init bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev)

{

	return false;

}

#endif



static __init struct device *sysfb_parent_dev(const struct screen_info *si)

{

	struct pci_dev *pdev;



	pdev = screen_info_pci_dev(si);

	if (IS_ERR(pdev)) {

		return ERR_CAST(pdev);

	} else if (pdev) {

		if (!sysfb_pci_dev_is_enabled(pdev))

			return ERR_PTR(-ENODEV);

		return &pdev->dev;

	}



	return NULL;

}



static __init int sysfb_init(void)

{

	struct screen_info *si = &screen_info;

	struct device *parent;

	struct simplefb_platform_data mode;

	const char *name;

	bool compatible;

	int ret = 0;



	screen_info_apply_fixups();



	mutex_lock(&disable_lock);

	if (disabled)

		goto unlock_mutex;



	sysfb_apply_efi_quirks();



	parent = sysfb_parent_dev(si);

	if (IS_ERR(parent))

		goto unlock_mutex;



	/* try to create a simple-framebuffer device */

	compatible = sysfb_parse_mode(si, &mode);

	if (compatible) {

		pd = sysfb_create_simplefb(si, &mode);

		pd = sysfb_create_simplefb(si, &mode, parent);

		if (!IS_ERR(pd))

			goto unlock_mutex;

	}
@@ -109,6 +156,8 @@ static __init int sysfb_init(void) 
		goto unlock_mutex;

	}



	pd->dev.parent = parent;



	sysfb_set_efifb_fwnode(pd);



	ret = platform_device_add_data(pd, si, sizeof(*si));