Commit ee8f3955 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'media/v4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
  - some last time changes before we stablize the new entity function
    integer numbers at uAPI
  - probe: fix erroneous return value on i2c/adp1653 driver
  - fix tx 5v detect regression on adv7604 driver
  - fix missing unlock on error in vpfe_prepare_pipeline() on
    davinci_vpfe driver

* tag 'media/v4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] media: Sanitise the reserved fields of the G_TOPOLOGY IOCTL arguments
  [media] media.h: postpone connectors entities
  [media] media.h: use hex values for range offsets,  move connectors base up.
  [media] adv7604: fix tx 5v detect regression
  [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST
  [media] [for,v4.5] media.h: increase the spacing between function ranges
  [media] media: i2c/adp1653: probe: fix erroneous return value
  [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
parents a7c9b603 fbe093ac
...@@ -56,10 +56,6 @@ ...@@ -56,10 +56,6 @@
<entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry> <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>
<entry>Connector for a RGB composite signal.</entry> <entry>Connector for a RGB composite signal.</entry>
</row> </row>
<row>
<entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
<entry>Connector for a test generator.</entry>
</row>
<row> <row>
<entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry> <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
<entry>Camera video sensor entity.</entry> <entry>Camera video sensor entity.</entry>
......
...@@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client, ...@@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client,
if (!client->dev.platform_data) { if (!client->dev.platform_data) {
dev_err(&client->dev, dev_err(&client->dev,
"Neither DT not platform data provided\n"); "Neither DT not platform data provided\n");
return EINVAL; return -EINVAL;
} }
flash->platform_data = client->dev.platform_data; flash->platform_data = client->dev.platform_data;
} }
......
...@@ -1960,10 +1960,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) ...@@ -1960,10 +1960,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
} }
/* tx 5v detect */ /* tx 5v detect */
tx_5v = io_read(sd, 0x70) & info->cable_det_mask; tx_5v = irq_reg_0x70 & info->cable_det_mask;
if (tx_5v) { if (tx_5v) {
v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v); v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);
io_write(sd, 0x71, tx_5v);
adv76xx_s_detect_tx_5v_ctrl(sd); adv76xx_s_detect_tx_5v_ctrl(sd);
if (handled) if (handled)
*handled = true; *handled = true;
......
...@@ -1843,8 +1843,7 @@ static void au0828_analog_create_entities(struct au0828_dev *dev) ...@@ -1843,8 +1843,7 @@ static void au0828_analog_create_entities(struct au0828_dev *dev)
ent->function = MEDIA_ENT_F_CONN_RF; ent->function = MEDIA_ENT_F_CONN_RF;
break; break;
default: /* AU0828_VMUX_DEBUG */ default: /* AU0828_VMUX_DEBUG */
ent->function = MEDIA_ENT_F_CONN_TEST; continue;
break;
} }
ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]); ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);
......
...@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video) ...@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
mutex_lock(&mdev->graph_mutex); mutex_lock(&mdev->graph_mutex);
ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev); ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
if (ret) { if (ret) {
mutex_unlock(&video->lock); mutex_unlock(&mdev->graph_mutex);
return -ENOMEM; return -ENOMEM;
} }
media_entity_graph_walk_start(&graph, entity); media_entity_graph_walk_start(&graph, entity);
......
...@@ -66,27 +66,33 @@ struct media_device_info { ...@@ -66,27 +66,33 @@ struct media_device_info {
/* /*
* DVB entities * DVB entities
*/ */
#define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 1) #define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 0x00001)
#define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 2) #define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 0x00002)
#define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 3) #define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 0x00003)
#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4) #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 0x00004)
/* /*
* Connectors * I/O entities
*/ */
/* It is a responsibility of the entity drivers to add connectors and links */ #define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 0x01001)
#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21) #define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 0x01002)
#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22) #define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 0x01003)
#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
/* For internal test signal generators and other debug connectors */
#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
/* /*
* I/O entities * Connectors
*/ */
#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31) /* It is a responsibility of the entity drivers to add connectors and links */
#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32) #ifdef __KERNEL__
#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) /*
* For now, it should not be used in userspace, as some
* definitions may change
*/
#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001)
#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002)
#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003)
#endif
/* /*
* Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
...@@ -291,14 +297,14 @@ struct media_v2_entity { ...@@ -291,14 +297,14 @@ 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) */
__u32 function; /* Main function of the entity */ __u32 function; /* Main function of the entity */
__u16 reserved[12]; __u32 reserved[6];
}; } __attribute__ ((packed));
/* Should match the specific fields at media_intf_devnode */ /* Should match the specific fields at media_intf_devnode */
struct media_v2_intf_devnode { struct media_v2_intf_devnode {
__u32 major; __u32 major;
__u32 minor; __u32 minor;
}; } __attribute__ ((packed));
struct media_v2_interface { struct media_v2_interface {
__u32 id; __u32 id;
...@@ -310,22 +316,22 @@ struct media_v2_interface { ...@@ -310,22 +316,22 @@ struct media_v2_interface {
struct media_v2_intf_devnode devnode; struct media_v2_intf_devnode devnode;
__u32 raw[16]; __u32 raw[16];
}; };
}; } __attribute__ ((packed));
struct media_v2_pad { struct media_v2_pad {
__u32 id; __u32 id;
__u32 entity_id; __u32 entity_id;
__u32 flags; __u32 flags;
__u16 reserved[9]; __u32 reserved[5];
}; } __attribute__ ((packed));
struct media_v2_link { struct media_v2_link {
__u32 id; __u32 id;
__u32 source_id; __u32 source_id;
__u32 sink_id; __u32 sink_id;
__u32 flags; __u32 flags;
__u32 reserved[5]; __u32 reserved[6];
}; } __attribute__ ((packed));
struct media_v2_topology { struct media_v2_topology {
__u64 topology_version; __u64 topology_version;
...@@ -345,7 +351,7 @@ struct media_v2_topology { ...@@ -345,7 +351,7 @@ struct media_v2_topology {
__u32 num_links; __u32 num_links;
__u32 reserved4; __u32 reserved4;
__u64 ptr_links; __u64 ptr_links;
}; } __attribute__ ((packed));
static inline void __user *media_get_uptr(__u64 arg) static inline void __user *media_get_uptr(__u64 arg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment