| Message ID | 20190611150955.8038-1-rui.silva@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: imx7-media-csi: get csi upstream endpoint | expand |
On Tue, Jun 11, 2019 at 04:09:55PM +0100, Rui Miguel Silva wrote: > When the upstream endpoint is neither a mux nor a CSI2 module, just get > the source pad directly upstream from the CSI. > > Fixes: 05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver") > Reported-by: Sebastien Szymanski <sebastien.szymanski@armadeus.com> > Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> > --- > drivers/staging/media/imx/imx7-media-csi.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c > index 9101566f3f67..8979ee0c8202 100644 > --- a/drivers/staging/media/imx/imx7-media-csi.c > +++ b/drivers/staging/media/imx/imx7-media-csi.c > @@ -442,6 +442,14 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, > > src = &csi->src_sd->entity; > > + /* > + * if the source in neither a mux or csi2 get the one directly upstream ^^ is? > + * from this csi > + */ > + if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && > + src->function != MEDIA_ENT_F_VID_MUX) > + src = &csi->sd.entity; This would be easier to read if the white space were tweaked a little: if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && src->function != MEDIA_ENT_F_VID_MUX) src = &csi->sd.entity; regards, dan carpenter
Hi Dan, On Wed 12 Jun 2019 at 08:43, Dan Carpenter wrote: > On Tue, Jun 11, 2019 at 04:09:55PM +0100, Rui Miguel Silva wrote: >> When the upstream endpoint is neither a mux nor a CSI2 module, just get >> the source pad directly upstream from the CSI. >> >> Fixes: 05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver") >> Reported-by: Sebastien Szymanski <sebastien.szymanski@armadeus.com> >> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> >> --- >> drivers/staging/media/imx/imx7-media-csi.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c >> index 9101566f3f67..8979ee0c8202 100644 >> --- a/drivers/staging/media/imx/imx7-media-csi.c >> +++ b/drivers/staging/media/imx/imx7-media-csi.c >> @@ -442,6 +442,14 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, >> >> src = &csi->src_sd->entity; >> >> + /* >> + * if the source in neither a mux or csi2 get the one directly upstream > ^^ > is? yup. > >> + * from this csi >> + */ >> + if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && >> + src->function != MEDIA_ENT_F_VID_MUX) >> + src = &csi->sd.entity; > > This would be easier to read if the white space were tweaked a little: > > if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && > src->function != MEDIA_ENT_F_VID_MUX) > src = &csi->sd.entity; Agreed, Thanks for the feedback. --- Cheers, Rui
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 9101566f3f67..8979ee0c8202 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -442,6 +442,14 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, src = &csi->src_sd->entity; + /* + * if the source in neither a mux or csi2 get the one directly upstream + * from this csi + */ + if (src->function != MEDIA_ENT_F_VID_IF_BRIDGE && + src->function != MEDIA_ENT_F_VID_MUX) + src = &csi->sd.entity; + skip_video_mux: /* get source pad of entity directly upstream from src */ pad = imx_media_pipeline_pad(src, 0, 0, true);
When the upstream endpoint is neither a mux nor a CSI2 module, just get the source pad directly upstream from the CSI. Fixes: 05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver") Reported-by: Sebastien Szymanski <sebastien.szymanski@armadeus.com> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> --- drivers/staging/media/imx/imx7-media-csi.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.22.0