Commit 3b38b65e authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Short summary of fixes pull

 * drm/hisilicon: Depend on MMU
 * drm/mgag200: Fix console on G200ER
 * drm/panel: Fix innolux_g121i1_l01 bus format

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YyxtXS588at6S4wg@linux-uq9g
parents 73646baf d8a79c03

drivers/gpu/drm/hisilicon/hibmc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config DRM_HISI_HIBMC

	tristate "DRM Support for Hisilicon Hibmc"

	depends on DRM && PCI && (ARM64 || COMPILE_TEST)

	depends on MMU

	select DRM_KMS_HELPER

	select DRM_VRAM_HELPER

	select DRM_TTM

drivers/gpu/drm/mgag200/mgag200_drv.c

+5 −1
Original line number Diff line number Diff line
@@ -262,7 +262,11 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret)

		return ret;



	drm_fbdev_generic_setup(dev, 0);

	/*

	 * FIXME: A 24-bit color depth does not work with 24 bpp on

	 * G200ER. Force 32 bpp.

	 */

	drm_fbdev_generic_setup(dev, 32);



	return 0;

}

drivers/gpu/drm/panel/panel-simple.c

+1 −1
Original line number Diff line number Diff line
@@ -2257,7 +2257,7 @@ static const struct panel_desc innolux_g121i1_l01 = { 
		.enable = 200,

		.disable = 20,

	},

	.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,

	.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,

	.connector_type = DRM_MODE_CONNECTOR_LVDS,

};