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

Commit 6b8952db authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Mauro Carvalho Chehab
Browse files

media: staging/imx: Re-organize modules 



Re-organize modules, and which objects are linked into those modules, so
that:

- imx6-media (renamed from imx-media) is the media driver module for
  imx5/6 only, and has no symbol exports.

- imx6-media-csi (renamed from imx-media-csi) is the subdev driver
  module for imx5/6 CSI. It is now linked direcly with imx-media-fim,
  since only the imx5/6 CSI makes use of the frame interval monitor.

- imx-media-common now only contains common code between imx5/6 and imx7
  media drivers. It contains imx-media-utils, imx-media-of,
  imx-media-dev-common, and imx-media-capture. In order to acheive that,
  some functions common to imx5/6 and imx7 have been moved out of
  imx-media-dev.c and into imx-media-dev-common.c.

Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 523759c7

drivers/staging/media/imx/Makefile

+8 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o \

imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \

	imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o

imx-media-objs += imx-media-dev-common.o

imx-media-common-objs := imx-media-utils.o imx-media-fim.o



obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media.o

imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \

	imx-media-of.o imx-media-utils.o



imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o



obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o

obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o

obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-capture.o



obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o

obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o

obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o



obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o

drivers/staging/media/imx/imx-media-dev-common.c

+340 −5
Original line number Diff line number Diff line
@@ -8,9 +8,342 @@ 


#include <linux/of_graph.h>

#include <linux/of_platform.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-mc.h>

#include "imx-media.h"



static const struct v4l2_async_notifier_operations imx_media_subdev_ops = {

static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n)

{

	return container_of(n, struct imx_media_dev, notifier);

}



/* async subdev bound notifier */

static int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,

				  struct v4l2_subdev *sd,

				  struct v4l2_async_subdev *asd)

{

	v4l2_info(sd->v4l2_dev, "subdev %s bound\n", sd->name);



	return 0;

}



/*

 * Create the media links for all subdevs that registered.

 * Called after all async subdevs have bound.

 */

static int imx_media_create_links(struct v4l2_async_notifier *notifier)

{

	struct imx_media_dev *imxmd = notifier2dev(notifier);

	struct v4l2_subdev *sd;



	list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {

		switch (sd->grp_id) {

		case IMX_MEDIA_GRP_ID_IPU_VDIC:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRP:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:

			/*

			 * links have already been created for the

			 * sync-registered subdevs.

			 */

			break;

		case IMX_MEDIA_GRP_ID_IPU_CSI0:

		case IMX_MEDIA_GRP_ID_IPU_CSI1:

		case IMX_MEDIA_GRP_ID_CSI:

			imx_media_create_csi_of_links(imxmd, sd);

			break;

		default:

			/*

			 * if this subdev has fwnode links, create media

			 * links for them.

			 */

			imx_media_create_of_links(imxmd, sd);

			break;

		}

	}



	return 0;

}



/*

 * adds given video device to given imx-media source pad vdev list.

 * Continues upstream from the pad entity's sink pads.

 */

static int imx_media_add_vdev_to_pad(struct imx_media_dev *imxmd,

				     struct imx_media_video_dev *vdev,

				     struct media_pad *srcpad)

{

	struct media_entity *entity = srcpad->entity;

	struct imx_media_pad_vdev *pad_vdev;

	struct list_head *pad_vdev_list;

	struct media_link *link;

	struct v4l2_subdev *sd;

	int i, ret;



	/* skip this entity if not a v4l2_subdev */

	if (!is_media_entity_v4l2_subdev(entity))

		return 0;



	sd = media_entity_to_v4l2_subdev(entity);



	pad_vdev_list = to_pad_vdev_list(sd, srcpad->index);

	if (!pad_vdev_list) {

		v4l2_warn(&imxmd->v4l2_dev, "%s:%u has no vdev list!\n",

			  entity->name, srcpad->index);

		/*

		 * shouldn't happen, but no reason to fail driver load,

		 * just skip this entity.

		 */

		return 0;

	}



	/* just return if we've been here before */

	list_for_each_entry(pad_vdev, pad_vdev_list, list) {

		if (pad_vdev->vdev == vdev)

			return 0;

	}



	dev_dbg(imxmd->md.dev, "adding %s to pad %s:%u\n",

		vdev->vfd->entity.name, entity->name, srcpad->index);



	pad_vdev = devm_kzalloc(imxmd->md.dev, sizeof(*pad_vdev), GFP_KERNEL);

	if (!pad_vdev)

		return -ENOMEM;



	/* attach this vdev to this pad */

	pad_vdev->vdev = vdev;

	list_add_tail(&pad_vdev->list, pad_vdev_list);



	/* move upstream from this entity's sink pads */

	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad = &entity->pads[i];



		if (!(pad->flags & MEDIA_PAD_FL_SINK))

			continue;



		list_for_each_entry(link, &entity->links, list) {

			if (link->sink != pad)

				continue;

			ret = imx_media_add_vdev_to_pad(imxmd, vdev,

							link->source);

			if (ret)

				return ret;

		}

	}



	return 0;

}



/*

 * For every subdevice, allocate an array of list_head's, one list_head

 * for each pad, to hold the list of video devices reachable from that

 * pad.

 */

static int imx_media_alloc_pad_vdev_lists(struct imx_media_dev *imxmd)

{

	struct list_head *vdev_lists;

	struct media_entity *entity;

	struct v4l2_subdev *sd;

	int i;



	list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {

		entity = &sd->entity;

		vdev_lists = devm_kcalloc(imxmd->md.dev,

					  entity->num_pads, sizeof(*vdev_lists),

					  GFP_KERNEL);

		if (!vdev_lists)

			return -ENOMEM;



		/* attach to the subdev's host private pointer */

		sd->host_priv = vdev_lists;



		for (i = 0; i < entity->num_pads; i++)

			INIT_LIST_HEAD(to_pad_vdev_list(sd, i));

	}



	return 0;

}



/* form the vdev lists in all imx-media source pads */

static int imx_media_create_pad_vdev_lists(struct imx_media_dev *imxmd)

{

	struct imx_media_video_dev *vdev;

	struct media_link *link;

	int ret;



	ret = imx_media_alloc_pad_vdev_lists(imxmd);

	if (ret)

		return ret;



	list_for_each_entry(vdev, &imxmd->vdev_list, list) {

		link = list_first_entry(&vdev->vfd->entity.links,

					struct media_link, list);

		ret = imx_media_add_vdev_to_pad(imxmd, vdev, link->source);

		if (ret)

			return ret;

	}



	return 0;

}



/* async subdev complete notifier */

int imx_media_probe_complete(struct v4l2_async_notifier *notifier)

{

	struct imx_media_dev *imxmd = notifier2dev(notifier);

	int ret;



	mutex_lock(&imxmd->mutex);



	ret = imx_media_create_links(notifier);

	if (ret)

		goto unlock;



	ret = imx_media_create_pad_vdev_lists(imxmd);

	if (ret)

		goto unlock;



	ret = v4l2_device_register_subdev_nodes(&imxmd->v4l2_dev);

unlock:

	mutex_unlock(&imxmd->mutex);

	if (ret)

		return ret;



	return media_device_register(&imxmd->md);

}

EXPORT_SYMBOL_GPL(imx_media_probe_complete);



/*

 * adds controls to a video device from an entity subdevice.

 * Continues upstream from the entity's sink pads.

 */

static int imx_media_inherit_controls(struct imx_media_dev *imxmd,

				      struct video_device *vfd,

				      struct media_entity *entity)

{

	int i, ret = 0;



	if (is_media_entity_v4l2_subdev(entity)) {

		struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);



		dev_dbg(imxmd->md.dev,

			"adding controls to %s from %s\n",

			vfd->entity.name, sd->entity.name);



		ret = v4l2_ctrl_add_handler(vfd->ctrl_handler,

					    sd->ctrl_handler,

					    NULL, true);

		if (ret)

			return ret;

	}



	/* move upstream */

	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad, *spad = &entity->pads[i];



		if (!(spad->flags & MEDIA_PAD_FL_SINK))

			continue;



		pad = media_entity_remote_pad(spad);

		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))

			continue;



		ret = imx_media_inherit_controls(imxmd, vfd, pad->entity);

		if (ret)

			break;

	}



	return ret;

}



static int imx_media_link_notify(struct media_link *link, u32 flags,

				 unsigned int notification)

{

	struct media_entity *source = link->source->entity;

	struct imx_media_pad_vdev *pad_vdev;

	struct list_head *pad_vdev_list;

	struct imx_media_dev *imxmd;

	struct video_device *vfd;

	struct v4l2_subdev *sd;

	int pad_idx, ret;



	ret = v4l2_pipeline_link_notify(link, flags, notification);

	if (ret)

		return ret;



	/* don't bother if source is not a subdev */

	if (!is_media_entity_v4l2_subdev(source))

		return 0;



	sd = media_entity_to_v4l2_subdev(source);

	pad_idx = link->source->index;



	imxmd = dev_get_drvdata(sd->v4l2_dev->dev);



	pad_vdev_list = to_pad_vdev_list(sd, pad_idx);

	if (!pad_vdev_list) {

		/* nothing to do if source sd has no pad vdev list */

		return 0;

	}



	/*

	 * Before disabling a link, reset controls for all video

	 * devices reachable from this link.

	 *

	 * After enabling a link, refresh controls for all video

	 * devices reachable from this link.

	 */

	if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH &&

	    !(flags & MEDIA_LNK_FL_ENABLED)) {

		list_for_each_entry(pad_vdev, pad_vdev_list, list) {

			vfd = pad_vdev->vdev->vfd;

			dev_dbg(imxmd->md.dev,

				"reset controls for %s\n",

				vfd->entity.name);

			v4l2_ctrl_handler_free(vfd->ctrl_handler);

			v4l2_ctrl_handler_init(vfd->ctrl_handler, 0);

		}

	} else if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&

		   (link->flags & MEDIA_LNK_FL_ENABLED)) {

		list_for_each_entry(pad_vdev, pad_vdev_list, list) {

			vfd = pad_vdev->vdev->vfd;

			dev_dbg(imxmd->md.dev,

				"refresh controls for %s\n",

				vfd->entity.name);

			ret = imx_media_inherit_controls(imxmd, vfd,

							 &vfd->entity);

			if (ret)

				break;

		}

	}



	return ret;

}



static void imx_media_notify(struct v4l2_subdev *sd, unsigned int notification,

			     void *arg)

{

	struct media_entity *entity = &sd->entity;

	int i;



	if (notification != V4L2_DEVICE_NOTIFY_EVENT)

		return;



	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad = &entity->pads[i];

		struct imx_media_pad_vdev *pad_vdev;

		struct list_head *pad_vdev_list;



		pad_vdev_list = to_pad_vdev_list(sd, pad->index);

		if (!pad_vdev_list)

			continue;

		list_for_each_entry(pad_vdev, pad_vdev_list, list)

			v4l2_event_queue(pad_vdev->vdev->vfd, arg);

	}

}



static const struct v4l2_async_notifier_operations imx_media_notifier_ops = {

	.bound = imx_media_subdev_bound,

	.complete = imx_media_probe_complete,

};
@@ -19,7 +352,8 @@ static const struct media_device_ops imx_media_md_ops = { 
	.link_notify = imx_media_link_notify,

};



struct imx_media_dev *imx_media_dev_init(struct device *dev)

struct imx_media_dev *imx_media_dev_init(struct device *dev,

					 const struct media_device_ops *ops)

{

	struct imx_media_dev *imxmd;

	int ret;
@@ -31,7 +365,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev) 
	dev_set_drvdata(dev, imxmd);



	strscpy(imxmd->md.model, "imx-media", sizeof(imxmd->md.model));

	imxmd->md.ops = &imx_media_md_ops;

	imxmd->md.ops = ops ? ops : &imx_media_md_ops;

	imxmd->md.dev = dev;



	mutex_init(&imxmd->mutex);
@@ -65,7 +399,8 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev) 
}

EXPORT_SYMBOL_GPL(imx_media_dev_init);



int imx_media_dev_notifier_register(struct imx_media_dev *imxmd)

int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,

			    const struct v4l2_async_notifier_operations *ops)

{

	int ret;
@@ -76,7 +411,7 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd) 
	}



	/* prepare the async subdev notifier and register it */

	imxmd->notifier.ops = &imx_media_subdev_ops;

	imxmd->notifier.ops = ops ? ops : &imx_media_notifier_ops;

	ret = v4l2_async_notifier_register(&imxmd->v4l2_dev,

					   &imxmd->notifier);

	if (ret) {

drivers/staging/media/imx/imx-media-dev.c

+11 −329
Original line number Diff line number Diff line
@@ -2,24 +2,13 @@ 
/*

 * V4L2 Media Controller Driver for Freescale i.MX5/6 SOC

 *

 * Copyright (c) 2016 Mentor Graphics Inc.

 * Copyright (c) 2016-2019 Mentor Graphics Inc.

 */

#include <linux/delay.h>

#include <linux/fs.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/timer.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-async.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-mc.h>

#include <video/imx-ipu-v3.h>

#include <media/imx.h>

#include "imx-media.h"
@@ -29,7 +18,7 @@ static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n) 
}



/* async subdev bound notifier */

int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,

static int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,

				  struct v4l2_subdev *sd,

				  struct v4l2_async_subdev *asd)

{
@@ -48,318 +37,11 @@ int imx_media_subdev_bound(struct v4l2_async_notifier *notifier, 
	return 0;

}



/*

 * Create the media links for all subdevs that registered.

 * Called after all async subdevs have bound.

 */

static int imx_media_create_links(struct v4l2_async_notifier *notifier)

{

	struct imx_media_dev *imxmd = notifier2dev(notifier);

	struct v4l2_subdev *sd;



	list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {

		switch (sd->grp_id) {

		case IMX_MEDIA_GRP_ID_IPU_VDIC:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRP:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:

		case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:

			/*

			 * links have already been created for the

			 * sync-registered subdevs.

			 */

			break;

		case IMX_MEDIA_GRP_ID_IPU_CSI0:

		case IMX_MEDIA_GRP_ID_IPU_CSI1:

		case IMX_MEDIA_GRP_ID_CSI:

			imx_media_create_csi_of_links(imxmd, sd);

			break;

		default:

			/*

			 * if this subdev has fwnode links, create media

			 * links for them.

			 */

			imx_media_create_of_links(imxmd, sd);

			break;

		}

	}



	return 0;

}



/*

 * adds given video device to given imx-media source pad vdev list.

 * Continues upstream from the pad entity's sink pads.

 */

static int imx_media_add_vdev_to_pad(struct imx_media_dev *imxmd,

				     struct imx_media_video_dev *vdev,

				     struct media_pad *srcpad)

{

	struct media_entity *entity = srcpad->entity;

	struct imx_media_pad_vdev *pad_vdev;

	struct list_head *pad_vdev_list;

	struct media_link *link;

	struct v4l2_subdev *sd;

	int i, ret;



	/* skip this entity if not a v4l2_subdev */

	if (!is_media_entity_v4l2_subdev(entity))

		return 0;



	sd = media_entity_to_v4l2_subdev(entity);



	pad_vdev_list = to_pad_vdev_list(sd, srcpad->index);

	if (!pad_vdev_list) {

		v4l2_warn(&imxmd->v4l2_dev, "%s:%u has no vdev list!\n",

			  entity->name, srcpad->index);

		/*

		 * shouldn't happen, but no reason to fail driver load,

		 * just skip this entity.

		 */

		return 0;

	}



	/* just return if we've been here before */

	list_for_each_entry(pad_vdev, pad_vdev_list, list) {

		if (pad_vdev->vdev == vdev)

			return 0;

	}



	dev_dbg(imxmd->md.dev, "adding %s to pad %s:%u\n",

		vdev->vfd->entity.name, entity->name, srcpad->index);



	pad_vdev = devm_kzalloc(imxmd->md.dev, sizeof(*pad_vdev), GFP_KERNEL);

	if (!pad_vdev)

		return -ENOMEM;



	/* attach this vdev to this pad */

	pad_vdev->vdev = vdev;

	list_add_tail(&pad_vdev->list, pad_vdev_list);



	/* move upstream from this entity's sink pads */

	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad = &entity->pads[i];



		if (!(pad->flags & MEDIA_PAD_FL_SINK))

			continue;



		list_for_each_entry(link, &entity->links, list) {

			if (link->sink != pad)

				continue;

			ret = imx_media_add_vdev_to_pad(imxmd, vdev,

							link->source);

			if (ret)

				return ret;

		}

	}



	return 0;

}



/*

 * For every subdevice, allocate an array of list_head's, one list_head

 * for each pad, to hold the list of video devices reachable from that

 * pad.

 */

static int imx_media_alloc_pad_vdev_lists(struct imx_media_dev *imxmd)

{

	struct list_head *vdev_lists;

	struct media_entity *entity;

	struct v4l2_subdev *sd;

	int i;



	list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {

		entity = &sd->entity;

		vdev_lists = devm_kcalloc(imxmd->md.dev,

					  entity->num_pads, sizeof(*vdev_lists),

					  GFP_KERNEL);

		if (!vdev_lists)

			return -ENOMEM;



		/* attach to the subdev's host private pointer */

		sd->host_priv = vdev_lists;



		for (i = 0; i < entity->num_pads; i++)

			INIT_LIST_HEAD(to_pad_vdev_list(sd, i));

	}



	return 0;

}



/* form the vdev lists in all imx-media source pads */

static int imx_media_create_pad_vdev_lists(struct imx_media_dev *imxmd)

{

	struct imx_media_video_dev *vdev;

	struct media_link *link;

	int ret;



	ret = imx_media_alloc_pad_vdev_lists(imxmd);

	if (ret)

		return ret;



	list_for_each_entry(vdev, &imxmd->vdev_list, list) {

		link = list_first_entry(&vdev->vfd->entity.links,

					struct media_link, list);

		ret = imx_media_add_vdev_to_pad(imxmd, vdev, link->source);

		if (ret)

			return ret;

	}



	return 0;

}



/* async subdev complete notifier */

int imx_media_probe_complete(struct v4l2_async_notifier *notifier)

{

	struct imx_media_dev *imxmd = notifier2dev(notifier);

	int ret;



	mutex_lock(&imxmd->mutex);



	ret = imx_media_create_links(notifier);

	if (ret)

		goto unlock;



	ret = imx_media_create_pad_vdev_lists(imxmd);

	if (ret)

		goto unlock;



	ret = v4l2_device_register_subdev_nodes(&imxmd->v4l2_dev);

unlock:

	mutex_unlock(&imxmd->mutex);

	if (ret)

		return ret;



	return media_device_register(&imxmd->md);

}



/*

 * adds controls to a video device from an entity subdevice.

 * Continues upstream from the entity's sink pads.

 */

static int imx_media_inherit_controls(struct imx_media_dev *imxmd,

				      struct video_device *vfd,

				      struct media_entity *entity)

{

	int i, ret = 0;



	if (is_media_entity_v4l2_subdev(entity)) {

		struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);



		dev_dbg(imxmd->md.dev,

			"adding controls to %s from %s\n",

			vfd->entity.name, sd->entity.name);



		ret = v4l2_ctrl_add_handler(vfd->ctrl_handler,

					    sd->ctrl_handler,

					    NULL, true);

		if (ret)

			return ret;

	}



	/* move upstream */

	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad, *spad = &entity->pads[i];



		if (!(spad->flags & MEDIA_PAD_FL_SINK))

			continue;



		pad = media_entity_remote_pad(spad);

		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))

			continue;



		ret = imx_media_inherit_controls(imxmd, vfd, pad->entity);

		if (ret)

			break;

	}



	return ret;

}



int imx_media_link_notify(struct media_link *link, u32 flags,

			  unsigned int notification)

{

	struct media_entity *source = link->source->entity;

	struct imx_media_pad_vdev *pad_vdev;

	struct list_head *pad_vdev_list;

	struct imx_media_dev *imxmd;

	struct video_device *vfd;

	struct v4l2_subdev *sd;

	int pad_idx, ret;



	ret = v4l2_pipeline_link_notify(link, flags, notification);

	if (ret)

		return ret;



	/* don't bother if source is not a subdev */

	if (!is_media_entity_v4l2_subdev(source))

		return 0;



	sd = media_entity_to_v4l2_subdev(source);

	pad_idx = link->source->index;



	imxmd = dev_get_drvdata(sd->v4l2_dev->dev);



	pad_vdev_list = to_pad_vdev_list(sd, pad_idx);

	if (!pad_vdev_list) {

		/* shouldn't happen, but no reason to fail link setup */

		return 0;

	}



	/*

	 * Before disabling a link, reset controls for all video

	 * devices reachable from this link.

	 *

	 * After enabling a link, refresh controls for all video

	 * devices reachable from this link.

	 */

	if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH &&

	    !(flags & MEDIA_LNK_FL_ENABLED)) {

		list_for_each_entry(pad_vdev, pad_vdev_list, list) {

			vfd = pad_vdev->vdev->vfd;

			dev_dbg(imxmd->md.dev,

				"reset controls for %s\n",

				vfd->entity.name);

			v4l2_ctrl_handler_free(vfd->ctrl_handler);

			v4l2_ctrl_handler_init(vfd->ctrl_handler, 0);

		}

	} else if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&

		   (link->flags & MEDIA_LNK_FL_ENABLED)) {

		list_for_each_entry(pad_vdev, pad_vdev_list, list) {

			vfd = pad_vdev->vdev->vfd;

			dev_dbg(imxmd->md.dev,

				"refresh controls for %s\n",

				vfd->entity.name);

			ret = imx_media_inherit_controls(imxmd, vfd,

							 &vfd->entity);

			if (ret)

				break;

		}

	}



	return ret;

}



void imx_media_notify(struct v4l2_subdev *sd, unsigned int notification,

		      void *arg)

{

	struct media_entity *entity = &sd->entity;

	int i;



	if (notification != V4L2_DEVICE_NOTIFY_EVENT)

		return;



	for (i = 0; i < entity->num_pads; i++) {

		struct media_pad *pad = &entity->pads[i];

		struct imx_media_pad_vdev *pad_vdev;

		struct list_head *pad_vdev_list;



		pad_vdev_list = to_pad_vdev_list(sd, pad->index);

		if (!pad_vdev_list)

			continue;

		list_for_each_entry(pad_vdev, pad_vdev_list, list)

			v4l2_event_queue(pad_vdev->vdev->vfd, arg);

	}

}

static const struct v4l2_async_notifier_operations imx_media_notifier_ops = {

	.bound = imx_media_subdev_bound,

	.complete = imx_media_probe_complete,

};



static int imx_media_probe(struct platform_device *pdev)

{
@@ -368,7 +50,7 @@ static int imx_media_probe(struct platform_device *pdev) 
	struct imx_media_dev *imxmd;

	int ret;



	imxmd = imx_media_dev_init(dev);

	imxmd = imx_media_dev_init(dev, NULL);

	if (IS_ERR(imxmd))

		return PTR_ERR(imxmd);
@@ -379,7 +61,7 @@ static int imx_media_probe(struct platform_device *pdev) 
		goto cleanup;

	}



	ret = imx_media_dev_notifier_register(imxmd);

	ret = imx_media_dev_notifier_register(imxmd, &imx_media_notifier_ops);

	if (ret)

		goto cleanup;

drivers/staging/media/imx/imx-media-fim.c

+0 −5
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ void imx_media_fim_eof_monitor(struct imx_media_fim *fim, ktime_t timestamp) 


	spin_unlock_irqrestore(&fim->lock, flags);

}

EXPORT_SYMBOL_GPL(imx_media_fim_eof_monitor);



/* Called by the subdev in its s_stream callback */

int imx_media_fim_set_stream(struct imx_media_fim *fim,
@@ -453,7 +452,6 @@ int imx_media_fim_set_stream(struct imx_media_fim *fim, 
	v4l2_ctrl_unlock(fim->ctrl[FIM_CL_ENABLE]);

	return ret;

}

EXPORT_SYMBOL_GPL(imx_media_fim_set_stream);



int imx_media_fim_add_controls(struct imx_media_fim *fim)

{
@@ -461,7 +459,6 @@ int imx_media_fim_add_controls(struct imx_media_fim *fim) 
	return v4l2_ctrl_add_handler(fim->sd->ctrl_handler,

				     &fim->ctrl_handler, NULL, false);

}

EXPORT_SYMBOL_GPL(imx_media_fim_add_controls);



/* Called by the subdev in its subdev registered callback */

struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd)
@@ -485,10 +482,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd) 


	return fim;

}

EXPORT_SYMBOL_GPL(imx_media_fim_init);



void imx_media_fim_free(struct imx_media_fim *fim)

{

	v4l2_ctrl_handler_free(&fim->ctrl_handler);

}
 
EXPORT_SYMBOL_GPL(imx_media_fim_free);

drivers/staging/media/imx/imx-media-of.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd, 
	of_node_put(csi_np);

	return ret;

}

EXPORT_SYMBOL_GPL(imx_media_add_of_subdevs);



/*

 * Create a single media link to/from sd using a fwnode link.
@@ -142,6 +143,7 @@ int imx_media_create_of_links(struct imx_media_dev *imxmd, 


	return 0;

}

EXPORT_SYMBOL_GPL(imx_media_create_of_links);



/*

 * Create media links to the given CSI subdevice's sink pads,
@@ -185,3 +187,4 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd, 


	return 0;

}

EXPORT_SYMBOL_GPL(imx_media_create_csi_of_links);