Skip to content

Commit 5d21db2

Browse files
committed
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
2 parents bd23a6a + ff065ea commit 5d21db2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/gpu/drm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ config DRM_TTM
198198
config DRM_TTM_KUNIT_TEST
199199
tristate "KUnit tests for TTM" if !KUNIT_ALL_TESTS
200200
default n
201-
depends on DRM && KUNIT
201+
depends on DRM && KUNIT && MMU
202202
select DRM_TTM
203203
select DRM_EXPORT_FOR_TESTS if m
204204
select DRM_KUNIT_TEST_HELPERS

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ static const struct panel_desc innolux_g121x1_l03 = {
23772377
};
23782378

23792379
static const struct display_timing innolux_g156hce_l01_timings = {
2380-
.pixelclock = { 120000000, 144000000, 150000000 },
2380+
.pixelclock = { 120000000, 141860000, 150000000 },
23812381
.hactive = { 1920, 1920, 1920 },
23822382
.hfront_porch = { 80, 90, 100 },
23832383
.hback_porch = { 80, 90, 100 },

0 commit comments

Comments
 (0)