Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333a6515 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Revert "[media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY" 



Enable MEDIA_IOC_G_TOPOLOGY ioctl for Kernel 4.6.

This reverts commit be0270ec.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 34bbea91

Documentation/DocBook/media/v4l/media-ioc-g-topology.xml

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ 


  <refsect1>

    <title>Description</title>



    <para><emphasis role="bold">NOTE:</emphasis> This new ioctl is programmed to be added on Kernel 4.6. Its definition/arguments may change until its final version.</para>



    <para>The typical usage of this ioctl is to call it twice.

    On the first call, the structure defined at &media-v2-topology; should

    be zeroed. At return, if no errors happen, this ioctl will return the

drivers/media/media-device.c

+1 −6
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static long media_device_setup_link(struct media_device *mdev, 
	return ret;

}



#if 0 /* Let's postpone it to Kernel 4.6 */

static long __media_device_get_topology(struct media_device *mdev,

				      struct media_v2_topology *topo)

{
@@ -390,7 +389,6 @@ static long media_device_get_topology(struct media_device *mdev, 


	return 0;

}

#endif



static long media_device_ioctl(struct file *filp, unsigned int cmd,

			       unsigned long arg)
@@ -424,14 +422,13 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd, 
		mutex_unlock(&dev->graph_mutex);

		break;



#if 0 /* Let's postpone it to Kernel 4.6 */

	case MEDIA_IOC_G_TOPOLOGY:

		mutex_lock(&dev->graph_mutex);

		ret = media_device_get_topology(dev,

				(struct media_v2_topology __user *)arg);

		mutex_unlock(&dev->graph_mutex);

		break;

#endif



	default:

		ret = -ENOIOCTLCMD;

	}
@@ -480,9 +477,7 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, 
	case MEDIA_IOC_DEVICE_INFO:

	case MEDIA_IOC_ENUM_ENTITIES:

	case MEDIA_IOC_SETUP_LINK:

#if 0 /* Let's postpone it to Kernel 4.6 */

	case MEDIA_IOC_G_TOPOLOGY:

#endif

		return media_device_ioctl(filp, cmd, arg);



	case MEDIA_IOC_ENUM_LINKS32:

include/uapi/linux/media.h

+1 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct media_links_enum { 
 *	  later, before the adding this API upstream.

 */



#if 0 /* Let's postpone it to Kernel 4.6 */



struct media_v2_entity {

	__u32 id;

	char name[64];		/* FIXME: move to a property? (RFC says so) */
@@ -351,7 +351,6 @@ static inline void __user *media_get_uptr(__u64 arg) 
{

	return (void __user *)(uintptr_t)arg;

}

#endif



/* ioctls */
@@ -359,9 +358,6 @@ static inline void __user *media_get_uptr(__u64 arg) 
#define MEDIA_IOC_ENUM_ENTITIES		_IOWR('|', 0x01, struct media_entity_desc)

#define MEDIA_IOC_ENUM_LINKS		_IOWR('|', 0x02, struct media_links_enum)

#define MEDIA_IOC_SETUP_LINK		_IOWR('|', 0x03, struct media_link_desc)



#if 0 /* Let's postpone it to Kernel 4.6 */

#define MEDIA_IOC_G_TOPOLOGY		_IOWR('|', 0x04, struct media_v2_topology)

#endif



#endif /* __LINUX_MEDIA_H */