diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-09-23 13:18:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-09-23 13:18:26 +1000 |
| commit | 3b38b65ed076fa93f1b0d5fb97c55a9bf692cc49 (patch) | |
| tree | 043d0274655391cdcc526a9baa7b3dd75348ede2 | |
| parent | 73646baf68444e24284516ddd4dac43ddb3162d4 (diff) | |
| parent | d8a79c03054911c375a2252627a429c9bc4615b6 (diff) | |
| download | linux-trace-3b38b65ed076fa93f1b0d5fb97c55a9bf692cc49.tar.gz | |
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 <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YyxtXS588at6S4wg@linux-uq9g
| -rw-r--r-- | drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig index 073adfe438dddc..4e41c144a2902a 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig +++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig @@ -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 diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 251a1bb648cc30..a222bf76804f24 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -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; } diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index ff5e1a44c43a51..1e716c23019a14 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -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, }; |