drop queue-4.14/drm-meson-venc-cvbs-fix-cvbs-mode-matching.patch

diff --git a/queue-4.14/drm-meson-venc-cvbs-fix-cvbs-mode-matching.patch b/queue-4.14/drm-meson-venc-cvbs-fix-cvbs-mode-matching.patch
deleted file mode 100644 (file)
index cc32a3b..0000000
--- a/queue-4.14/drm-meson-venc-cvbs-fix-cvbs-mode-matching.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 43cb86799ff03e9819c07f37f72f80f8246ad7ed Mon Sep 17 00:00:00 2001
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Date: Sun, 8 Dec 2019 18:18:31 +0100
-Subject: drm: meson: venc: cvbs: fix CVBS mode matching
-
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-
-commit 43cb86799ff03e9819c07f37f72f80f8246ad7ed upstream.
-
-With commit 222ec1618c3ace ("drm: Add aspect ratio parsing in DRM
-layer") the drm core started honoring the picture_aspect_ratio field
-when comparing two drm_display_modes. Prior to that it was ignored.
-When the CVBS encoder driver was initially submitted there was no aspect
-ratio check.
-
-Switch from drm_mode_equal() to drm_mode_match() without
-DRM_MODE_MATCH_ASPECT_RATIO to fix "kmscube" and X.org output using the
-CVBS connector. When (for example) kmscube sets the output mode when
-using the CVBS connector it passes HDMI_PICTURE_ASPECT_NONE, making the
-drm_mode_equal() fail as it include the aspect ratio.
-
-Prior to this patch kmscube reported:
-  failed to set mode: Invalid argument
-
-The CVBS mode checking in the sun4i (drivers/gpu/drm/sun4i/sun4i_tv.c
-sun4i_tv_mode_to_drm_mode) and ZTE (drivers/gpu/drm/zte/zx_tvenc.c
-tvenc_mode_{pal,ntsc}) drivers don't set the "picture_aspect_ratio" at
-all. The Meson VPU driver does not rely on the aspect ratio for the CVBS
-output so we can safely decouple it from the hdmi_picture_aspect
-setting.
-
-Cc: <stable@vger.kernel.org>
-Fixes: 222ec1618c3ace ("drm: Add aspect ratio parsing in DRM layer")
-Fixes: bbbe775ec5b5da ("drm: Add support for Amlogic Meson Graphic Controller")
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Acked-by: Neil Armstrong <narmstrong@baylibre.com>
-[narmstrong: squashed with drm: meson: venc: cvbs: deduplicate the meson_cvbs_mode lookup code]
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20191208171832.1064772-3-martin.blumenstingl@googlemail.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/meson/meson_venc_cvbs.c |   48 ++++++++++++++++++--------------
- 1 file changed, 27 insertions(+), 21 deletions(-)
-
---- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
-+++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
-@@ -75,6 +75,25 @@ struct meson_cvbs_mode meson_cvbs_modes[
-       },
- };
- 
-+static const struct meson_cvbs_mode *
-+meson_cvbs_get_mode(const struct drm_display_mode *req_mode)
-+{
-+      int i;
-+
-+      for (i = 0; i < MESON_CVBS_MODES_COUNT; ++i) {
-+              struct meson_cvbs_mode *meson_mode = &meson_cvbs_modes[i];
-+
-+              if (drm_mode_match(req_mode, &meson_mode->mode,
-+                                 DRM_MODE_MATCH_TIMINGS |
-+                                 DRM_MODE_MATCH_CLOCK |
-+                                 DRM_MODE_MATCH_FLAGS |
-+                                 DRM_MODE_MATCH_3D_FLAGS))
-+                      return meson_mode;
-+      }
-+
-+      return NULL;
-+}
-+
- /* Connector */
- 
- static void meson_cvbs_connector_destroy(struct drm_connector *connector)
-@@ -147,14 +166,8 @@ static int meson_venc_cvbs_encoder_atomi
-                                       struct drm_crtc_state *crtc_state,
-                                       struct drm_connector_state *conn_state)
- {
--      int i;
--
--      for (i = 0; i < MESON_CVBS_MODES_COUNT; ++i) {
--              struct meson_cvbs_mode *meson_mode = &meson_cvbs_modes[i];
--
--              if (drm_mode_equal(&crtc_state->mode, &meson_mode->mode))
--                      return 0;
--      }
-+      if (meson_cvbs_get_mode(&crtc_state->mode))
-+              return 0;
- 
-       return -EINVAL;
- }
-@@ -192,24 +205,17 @@ static void meson_venc_cvbs_encoder_mode
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
- {
-+      const struct meson_cvbs_mode *meson_mode = meson_cvbs_get_mode(mode);
-       struct meson_venc_cvbs *meson_venc_cvbs =
-                                       encoder_to_meson_venc_cvbs(encoder);
-       struct meson_drm *priv = meson_venc_cvbs->priv;
--      int i;
- 
--      for (i = 0; i < MESON_CVBS_MODES_COUNT; ++i) {
--              struct meson_cvbs_mode *meson_mode = &meson_cvbs_modes[i];
-+      if (meson_mode) {
-+              meson_venci_cvbs_mode_set(priv, meson_mode->enci);
- 
--              if (drm_mode_equal(mode, &meson_mode->mode)) {
--                      meson_venci_cvbs_mode_set(priv,
--                                                meson_mode->enci);
--
--                      /* Setup 27MHz vclk2 for ENCI and VDAC */
--                      meson_vclk_setup(priv, MESON_VCLK_TARGET_CVBS,
--                                       MESON_VCLK_CVBS, MESON_VCLK_CVBS,
--                                       MESON_VCLK_CVBS, true);
--                      break;
--              }
-+              /* Setup 27MHz vclk2 for ENCI and VDAC */
-+              meson_vclk_setup(priv, MESON_VCLK_TARGET_CVBS, MESON_VCLK_CVBS,
-+                               MESON_VCLK_CVBS, MESON_VCLK_CVBS, true);
-       }
- }
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 0c6d27702fabac68c82d315852a780c2768eb6a7..ce3bb695d6d965d6baac408dd72cb38a324d637f 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -28,7 +28,6 @@ arm-dts-s3c64xx-fix-init-order-of-clock-providers.patch
 arm-tegra-fix-flow_ctlr_halt-register-clobbering-by-tegra_resume.patch
 vfio-pci-call-irq_bypass_unregister_producer-before-freeing-irq.patch
 dma-buf-fix-memory-leak-in-sync_file_merge.patch
-drm-meson-venc-cvbs-fix-cvbs-mode-matching.patch
 dm-btree-increase-rebalance-threshold-in-__rebalance2.patch
 scsi-iscsi-fix-a-potential-deadlock-in-the-timeout-handler.patch
 drm-radeon-fix-r1xx-r2xx-register-checker-for-pot-textures.patch