Commit 5d21db26 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2023-08-17' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230817131832.GA9361@linux-uq9g
parents bd23a6ac ff065eaf

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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 },