* [PATCH AUTOSEL 4.14 2/4] fbdev: modedb: Add 1920x1080 at 60 Hz video mode [not found] <20230520182432.866012-1-sashal@kernel.org> @ 2023-05-20 18:24 ` Sasha Levin 2023-05-20 18:24 ` [PATCH AUTOSEL 4.14 3/4] fbdev: stifb: Fix info entry in sti_struct on error path Sasha Levin 1 sibling, 0 replies; 2+ messages in thread From: Sasha Levin @ 2023-05-20 18:24 UTC (permalink / raw) To: linux-kernel, stable Cc: Helge Deller, Sasha Levin, daniel, javierm, tzimmermann, linux-fbdev, dri-devel From: Helge Deller <deller@gmx.de> [ Upstream commit c8902258b2b8ecaa1b8d88c312853c5b14c2553d ] Add typical resolution for Full-HD monitors. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/video/fbdev/core/modedb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c index a9d76e1b43781..d02712548a3e4 100644 --- a/drivers/video/fbdev/core/modedb.c +++ b/drivers/video/fbdev/core/modedb.c @@ -257,6 +257,11 @@ static const struct fb_videomode modedb[] = { { NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, 0, FB_VMODE_DOUBLE }, + /* 1920x1080 @ 60 Hz, 67.3 kHz hsync */ + { NULL, 60, 1920, 1080, 6734, 148, 88, 36, 4, 44, 5, 0, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + FB_VMODE_NONINTERLACED }, + /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- 2.39.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH AUTOSEL 4.14 3/4] fbdev: stifb: Fix info entry in sti_struct on error path [not found] <20230520182432.866012-1-sashal@kernel.org> 2023-05-20 18:24 ` [PATCH AUTOSEL 4.14 2/4] fbdev: modedb: Add 1920x1080 at 60 Hz video mode Sasha Levin @ 2023-05-20 18:24 ` Sasha Levin 1 sibling, 0 replies; 2+ messages in thread From: Sasha Levin @ 2023-05-20 18:24 UTC (permalink / raw) To: linux-kernel, stable Cc: Helge Deller, Sasha Levin, James.Bottomley, linux-parisc, linux-fbdev, dri-devel From: Helge Deller <deller@gmx.de> [ Upstream commit 0bdf1ad8d10bd4e50a8b1a2c53d15984165f7fea ] Minor fix to reset the info field to NULL in case of error. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/video/fbdev/stifb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index 9313562e739e1..16eed250fd8f3 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1373,6 +1373,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) iounmap(info->screen_base); out_err0: kfree(fb); + sti->info = NULL; return -ENXIO; } -- 2.39.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-20 18:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20230520182432.866012-1-sashal@kernel.org>
2023-05-20 18:24 ` [PATCH AUTOSEL 4.14 2/4] fbdev: modedb: Add 1920x1080 at 60 Hz video mode Sasha Levin
2023-05-20 18:24 ` [PATCH AUTOSEL 4.14 3/4] fbdev: stifb: Fix info entry in sti_struct on error path Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).