diff options
| author |   Dave Airlie <airlied@redhat.com> | 2023-08-21 05:39:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-21 05:40:11 +1000 |
| commit | 5d21db2680cba2998f708ba87f1c1897ecc51997 (patch) | |
| tree | 0827dbfe52d56245209f3672878e71d63c0227b1 | |
| parent | Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next (diff) | |
| parent | drm/ttm/tests: Require MMU when testing (diff) | |
| download | wireguard-linux-5d21db2680cba2998f708ba87f1c1897ecc51997.tar.xz wireguard-linux-5d21db2680cba2998f708ba87f1c1897ecc51997.zip | |
Merge tag 'drm-misc-next-fixes-2023-08-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
* Add MMU dependency to TTM unit tests
* panel: Fix Innolux G156HCE-L01 LVDS clock
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230817131832.GA9361@linux-uq9g
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 9d1f0e04fd56..ab9ef1c20349 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -198,7 +198,7 @@ config DRM_TTM config DRM_TTM_KUNIT_TEST tristate "KUnit tests for TTM" if !KUNIT_ALL_TESTS default n - depends on DRM && KUNIT + depends on DRM && KUNIT && MMU select DRM_TTM select DRM_EXPORT_FOR_TESTS if m select DRM_KUNIT_TEST_HELPERS diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 72cef64441a6..1b50d17bebe0 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -2377,7 +2377,7 @@ static const struct panel_desc innolux_g121x1_l03 = { }; static const struct display_timing innolux_g156hce_l01_timings = { - .pixelclock = { 120000000, 144000000, 150000000 }, + .pixelclock = { 120000000, 141860000, 150000000 }, .hactive = { 1920, 1920, 1920 }, .hfront_porch = { 80, 90, 100 }, .hback_porch = { 80, 90, 100 }, |