Commit 2ae6ab9d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-08-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



One patch for imx/dcss to get rid of a warning message, one off-by-one
fix and GA103 support for nouveau, a refcounting fix for meson, a NULL
pointer dereference fix for ttm, a error check fix for lvds-codec, a
dt-binding schema fix and an underflow fix for sun4i

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220816094401.wtadc7ddr6lzq6aj@houat
parents 8ae4be56 82a1356a

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun8i-v3s-tcon

              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:
@@ -252,6 +253,7 @@ allOf: 
              - allwinner,sun8i-a83t-tcon-tv

              - allwinner,sun8i-r40-tcon-tv

              - allwinner,sun9i-a80-tcon-tv

              - allwinner,sun20i-d1-tcon-tv



    then:

      properties:
@@ -278,6 +280,7 @@ allOf: 
              - allwinner,sun9i-a80-tcon-lcd

              - allwinner,sun4i-a10-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      required:
@@ -294,6 +297,7 @@ allOf: 
              - allwinner,sun8i-a23-tcon

              - allwinner,sun8i-a33-tcon

              - allwinner,sun8i-a83t-tcon-lcd

              - allwinner,sun20i-d1-tcon-lcd



    then:

      properties:

drivers/gpu/drm/bridge/lvds-codec.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int lvds_codec_probe(struct platform_device *pdev) 
		of_node_put(bus_node);

		if (ret == -ENODEV) {

			dev_warn(dev, "missing 'data-mapping' DT property\n");

		} else if (ret) {

		} else if (ret < 0) {

			dev_err(dev, "invalid 'data-mapping' DT property\n");

			return ret;

		} else {

drivers/gpu/drm/imx/dcss/dcss-kms.c

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) 


	drm_kms_helper_poll_init(drm);



	drm_bridge_connector_enable_hpd(kms->connector);



	ret = drm_dev_register(drm, 0);

	if (ret)

		goto cleanup_crtc;

drivers/gpu/drm/meson/meson_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ static bool meson_vpu_has_available_connectors(struct device *dev) 
	for_each_endpoint_of_node(dev->of_node, ep) {

		/* If the endpoint node exists, consider it enabled */

		remote = of_graph_get_remote_port(ep);

		if (remote)

		if (remote) {

			of_node_put(remote);

			of_node_put(ep);

			return true;

		}

	}



	return false;

}

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+22 −0
Original line number Diff line number Diff line
@@ -2604,6 +2604,27 @@ nv172_chipset = { 
	.fifo     = { 0x00000001, ga102_fifo_new },

};



static const struct nvkm_device_chip

nv173_chipset = {

	.name = "GA103",

	.bar      = { 0x00000001, tu102_bar_new },

	.bios     = { 0x00000001, nvkm_bios_new },

	.devinit  = { 0x00000001, ga100_devinit_new },

	.fb       = { 0x00000001, ga102_fb_new },

	.gpio     = { 0x00000001, ga102_gpio_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.mc       = { 0x00000001, ga100_mc_new },

	.mmu      = { 0x00000001, tu102_mmu_new },

	.pci      = { 0x00000001, gp100_pci_new },

	.privring = { 0x00000001, gm200_privring_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, ga100_top_new },

	.disp     = { 0x00000001, ga102_disp_new },

	.dma      = { 0x00000001, gv100_dma_new },

	.fifo     = { 0x00000001, ga102_fifo_new },

};



static const struct nvkm_device_chip

nv174_chipset = {

	.name = "GA104",
@@ -3067,6 +3088,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
		case 0x167: device->chip = &nv167_chipset; break;

		case 0x168: device->chip = &nv168_chipset; break;

		case 0x172: device->chip = &nv172_chipset; break;

		case 0x173: device->chip = &nv173_chipset; break;

		case 0x174: device->chip = &nv174_chipset; break;

		case 0x176: device->chip = &nv176_chipset; break;

		case 0x177: device->chip = &nv177_chipset; break;