diff options
| author |   Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
| commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
| tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/gpu/drm/panel | |
| parent | macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff) | |
| parent | Linux 6.0-rc7 (diff) | |
| download | linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.zip | |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/gpu/drm/panel')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-edp.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/panel/panel-simple.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index cdb154c8b866..b75c690bb0cc 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1295,7 +1295,8 @@ static const struct panel_desc innolux_n116bca_ea1 = { }, .delay = { .hpd_absent = 200, - .prepare_to_enable = 80, + .enable = 80, + .disable = 50, .unprepare = 500, }, }; diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index ff5e1a44c43a..1e716c23019a 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, }; |