Skip to content

Commit 3b38b65

Browse files
committed
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: Dave Airlie <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/YyxtXS588at6S4wg@linux-uq9g
2 parents 73646ba + d8a79c0 commit 3b38b65

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

drivers/gpu/drm/hisilicon/hibmc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
config DRM_HISI_HIBMC
33
tristate "DRM Support for Hisilicon Hibmc"
44
depends on DRM && PCI && (ARM64 || COMPILE_TEST)
5+
depends on MMU
56
select DRM_KMS_HELPER
67
select DRM_VRAM_HELPER
78
select DRM_TTM

drivers/gpu/drm/mgag200/mgag200_drv.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
262262
if (ret)
263263
return ret;
264264

265-
drm_fbdev_generic_setup(dev, 0);
265+
/*
266+
* FIXME: A 24-bit color depth does not work with 24 bpp on
267+
* G200ER. Force 32 bpp.
268+
*/
269+
drm_fbdev_generic_setup(dev, 32);
266270

267271
return 0;
268272
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ static const struct panel_desc innolux_g121i1_l01 = {
22572257
.enable = 200,
22582258
.disable = 20,
22592259
},
2260-
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
2260+
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
22612261
.connector_type = DRM_MODE_CONNECTOR_LVDS,
22622262
};
22632263

0 commit comments

Comments
 (0)