2 files changed, 28 insertions, 1 deletions

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 7dae0ac0f3ae..e9219f528d7e 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -20,6 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/* We need to access legacy defines from linux/media.h */
+#define __NEED_MEDIA_LEGACY_API
+
 #include <linux/compat.h>
 #include <linux/export.h>
 #include <linux/idr.h>
@@ -115,6 +118,26 @@ static long media_device_enum_entities(struct media_device *mdev,
         u_ent.group_id = 0;             /* Unused */
         u_ent.pads = ent->num_pads;
         u_ent.links = ent->num_links - ent->num_backlinks;
+
+        /*
+         * Workaround for a bug at media-ctl <= v1.10 that makes it to
+         * do the wrong thing if the entity function doesn't belong to
+         * either MEDIA_ENT_F_OLD_BASE or MEDIA_ENT_F_OLD_SUBDEV_BASE
+         * Ranges.
+         *
+         * Non-subdevices are expected to be at the MEDIA_ENT_F_OLD_BASE,
+         * or, otherwise, will be silently ignored by media-ctl when
+         * printing the graphviz diagram. So, map them into the devnode
+         * old range.
+         */
+        if (ent->function < MEDIA_ENT_F_OLD_BASE ||
+            ent->function > MEDIA_ENT_T_DEVNODE_UNKNOWN) {
+                if (is_media_entity_v4l2_subdev(ent))
+                        u_ent.type = MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN;
+                else if (ent->function != MEDIA_ENT_F_IO_V4L)
+                        u_ent.type = MEDIA_ENT_T_DEVNODE_UNKNOWN;
+        }
+
         memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));
         if (copy_to_user(uent, &u_ent, sizeof(u_ent)))
                 return -EFAULT;
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 625b38f65764..a8e3a8c0d85a 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -120,7 +120,7 @@ struct media_device_info {
 
 #define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE
 
-#ifndef __KERNEL__
+#if !defined(__KERNEL__) || defined(__NEED_MEDIA_LEGACY_API)
 
 /*
  * Legacy symbols used to avoid userspace compilation breakages
@@ -133,6 +133,10 @@ struct media_device_info {
 #define MEDIA_ENT_TYPE_MASK             0x00ff0000
 #define MEDIA_ENT_SUBTYPE_MASK          0x0000ffff
 
+/* End of the old subdev reserved numberspace */
+#define MEDIA_ENT_T_DEVNODE_UNKNOWN     (MEDIA_ENT_T_DEVNODE | \
+                                         MEDIA_ENT_SUBTYPE_MASK)
+
 #define MEDIA_ENT_T_DEVNODE             MEDIA_ENT_F_OLD_BASE
 #define MEDIA_ENT_T_DEVNODE_V4L         MEDIA_ENT_F_IO_V4L
 #define MEDIA_ENT_T_DEVNODE_FB          (MEDIA_ENT_T_DEVNODE + 2)