xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY"

Browse Source 
Enable MEDIA_IOC_G_TOPOLOGY ioctl for Kernel 4.6.

This reverts commit be0270ec89.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab
2016-01-25 07:29:13 -02:00
parent 34bbea9112
commit 333a651534
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
View File

@@ -48,9 +48,6 @@
<refsect1> <refsect1>
<title>Description</title> <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. <para>The typical usage of this ioctl is to call it twice.
On the first call, the structure defined at &media-v2-topology; should 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 be zeroed. At return, if no errors happen, this ioctl will return the

7
drivers/media/media-device.c
View File

@@ -234,7 +234,6 @@ static long media_device_setup_link(struct media_device *mdev,
return ret; return ret;
} }
#if 0 /* Let's postpone it to Kernel 4.6 */
static long __media_device_get_topology(struct media_device *mdev, static long __media_device_get_topology(struct media_device *mdev,
struct media_v2_topology *topo) struct media_v2_topology *topo)
{ {
@@ -390,7 +389,6 @@ static long media_device_get_topology(struct media_device *mdev,
return 0; return 0;
} }
#endif
static long media_device_ioctl(struct file *filp, unsigned int cmd, static long media_device_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg) unsigned long arg)
@@ -424,14 +422,13 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd,
mutex_unlock(&dev->graph_mutex); mutex_unlock(&dev->graph_mutex);
break; break;
#if 0 /* Let's postpone it to Kernel 4.6 */
case MEDIA_IOC_G_TOPOLOGY: case MEDIA_IOC_G_TOPOLOGY:
mutex_lock(&dev->graph_mutex); mutex_lock(&dev->graph_mutex);
ret = media_device_get_topology(dev, ret = media_device_get_topology(dev,
(struct media_v2_topology __user *)arg); (struct media_v2_topology __user *)arg);
mutex_unlock(&dev->graph_mutex); mutex_unlock(&dev->graph_mutex);
break; break;
#endif
default: default:
ret = -ENOIOCTLCMD; 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_DEVICE_INFO:
case MEDIA_IOC_ENUM_ENTITIES: case MEDIA_IOC_ENUM_ENTITIES:
case MEDIA_IOC_SETUP_LINK: case MEDIA_IOC_SETUP_LINK:
#if 0 /* Let's postpone it to Kernel 4.6 */
case MEDIA_IOC_G_TOPOLOGY: case MEDIA_IOC_G_TOPOLOGY:
#endif
return media_device_ioctl(filp, cmd, arg); return media_device_ioctl(filp, cmd, arg);
case MEDIA_IOC_ENUM_LINKS32: case MEDIA_IOC_ENUM_LINKS32:

6
include/uapi/linux/media.h
View File

@@ -286,7 +286,7 @@ struct media_links_enum {
* later, before the adding this API upstream. * later, before the adding this API upstream.
*/ */
#if 0 /* Let's postpone it to Kernel 4.6 */
struct media_v2_entity { struct media_v2_entity {
__u32 id; __u32 id;
char name[64]; /* FIXME: move to a property? (RFC says so) */ 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; return (void __user *)(uintptr_t)arg;
} }
#endif
/* ioctls */ /* 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_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)
#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) #define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum)
#define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc) #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) #define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology)
#endif
#endif /* __LINUX_MEDIA_H */ #endif /* __LINUX_MEDIA_H */