summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/meson
diff options
context:
space:
mode:
authorChristian Hewitt2018-11-21 10:39:29 +0100
committerGreg Kroah-Hartman2018-12-17 09:24:36 +0100
commitbf6f1276768f31bdd00c9d5f50cff4c26330a101 (patch)
tree7addfda44ec57c43c93946e9b4600aaa978346e1 /drivers/gpu/drm/meson
parentthunderbolt: Prevent root port runtime suspend during NVM upgrade (diff)
downloadkernel-qcow2-linux-bf6f1276768f31bdd00c9d5f50cff4c26330a101.tar.gz
kernel-qcow2-linux-bf6f1276768f31bdd00c9d5f50cff4c26330a101.tar.xz
kernel-qcow2-linux-bf6f1276768f31bdd00c9d5f50cff4c26330a101.zip
drm/meson: add support for 1080p25 mode
[ Upstream commit 31e1ab494559fb46de304cc6c2aed1528f94b298 ] This essential mode for PAL users is missing, so add it. Fixes: 335e3713afb87 ("drm/meson: Add support for HDMI venc modes and settings") Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/1542793169-13008-1-git-send-email-christianshewitt@gmail.com Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/meson')
-rw-r--r--drivers/gpu/drm/meson/meson_venc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 14aac661f38b..7a3a6ed9f27b 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -715,6 +715,7 @@ struct meson_hdmi_venc_vic_mode {
{ 5, &meson_hdmi_encp_mode_1080i60 },
{ 20, &meson_hdmi_encp_mode_1080i50 },
{ 32, &meson_hdmi_encp_mode_1080p24 },
+ { 33, &meson_hdmi_encp_mode_1080p50 },
{ 34, &meson_hdmi_encp_mode_1080p30 },
{ 31, &meson_hdmi_encp_mode_1080p50 },
{ 16, &meson_hdmi_encp_mode_1080p60 },