On Sat, 21 May 2022 at 18:07, Daniel Vetter <daniel@xxxxxxxx> wrote:
>
> On Tue, 17 May 2022 at 18:09, Robert Foss <robert.foss@xxxxxxxxxx> wrote:
> >
> > On Mon, 25 Apr 2022 at 11:14, Xin Ji <xji@xxxxxxxxxxxxxxxx> wrote:
> > >
> > > On Mon, Apr 25, 2022 at 04:24:50PM +0800, Chen-Yu Tsai wrote:
> > > > On Fri, Apr 22, 2022 at 10:13 PM Robert Foss <robert.foss@xxxxxxxxxx> wrote:
> > > > >
> > > > > On Fri, 22 Apr 2022 at 16:01, Robert Foss <robert.foss@xxxxxxxxxx> wrote:
> > > > > >
> > > > > > On Fri, 22 Apr 2022 at 10:49, Xin Ji <xji@xxxxxxxxxxxxxxxx> wrote:
> > > > > > >
> > > > > > > As V4L2_FWNODE_BUS_TYPE_PARALLEL not properly descript for DPI
> > > > > > > interface, this patch use new defined V4L2_FWNODE_BUS_TYPE_DPI for it.
> > > > > > >
> > > > > > > Fixes: fd0310b6fe7d ("drm/bridge: anx7625: add MIPI DPI input feature")
> > > > > > > Signed-off-by: Xin Ji <xji@xxxxxxxxxxxxxxxx>
> > > > > > > ---
> > > > > > > drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++----
> > > > > > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > > > > > >
> > > > > > > diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> > > > > > > index 376da01243a3..71df977e8f53 100644
> > > > > > > --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> > > > > > > +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> > > > > > > @@ -1623,14 +1623,14 @@ static int anx7625_parse_dt(struct device *dev,
> > > > > > >
> > > > > > > anx7625_get_swing_setting(dev, pdata);
> > > > > > >
> > > > > > > - pdata->is_dpi = 1; /* default dpi mode */
> > > > > > > + pdata->is_dpi = 0; /* default dsi mode */
> > > > > > > pdata->mipi_host_node = of_graph_get_remote_node(np, 0, 0);
> > > > > > > if (!pdata->mipi_host_node) {
> > > > > > > DRM_DEV_ERROR(dev, "fail to get internal panel.\n");
> > > > > > > return -ENODEV;
> > > > > > > }
> > > > > > >
> > > > > > > - bus_type = V4L2_FWNODE_BUS_TYPE_PARALLEL;
> > > > > > > + bus_type = 0;
> > > > > > > mipi_lanes = MAX_LANES_SUPPORT;
> > > > > > > ep0 = of_graph_get_endpoint_by_regs(np, 0, 0);
> > > > > > > if (ep0) {
> > > > > > > @@ -1640,8 +1640,8 @@ static int anx7625_parse_dt(struct device *dev,
> > > > > > > mipi_lanes = of_property_count_u32_elems(ep0, "data-lanes");
> > > > > > > }
> > > > > > >
> > > > > > > - if (bus_type == V4L2_FWNODE_BUS_TYPE_PARALLEL) /* bus type is Parallel(DSI) */
> > > > > > > - pdata->is_dpi = 0;
> > > > > > > + if (bus_type == V4L2_FWNODE_BUS_TYPE_DPI) /* bus type is DPI */
> > > > > > > + pdata->is_dpi = 1;
> > > > > > >
> > > > > > > pdata->mipi_lanes = mipi_lanes;
> > > > > > > if (pdata->mipi_lanes > MAX_LANES_SUPPORT || pdata->mipi_lanes <= 0)
> > > > > >
> > > > > > Reviewed-by: Robert Foss <robert.foss@xxxxxxxxxx>
> > > > >
> > > > > Acked-by: Robert Foss <robert.foss@xxxxxxxxxx>
> > > >
> > > > Tested-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> > > >
> > > > Confirmed this fixes the display on Juniper (Acer Chromebook Spin 311) on
> > > > mainline (next-20220422).
> > > >
> > > > Xin, in the future, please send the whole series to all recipients of
> > > > all patches listed by get_maintainers.pl, not just the recipients of
> > > > each patch. In the case of this series, they should have been sent
> > > > to all of the mailing lists (media, devicetree, dri-devel) so that
> > > > everyone has the same, full view of the patches.
> > > Hi ChenYu, OK, I'll send to all media, devicetree, dri-devel next time.
> > > Thanks,
> > > Xin
> > > >
> > > > ChenYu
> >
> > Applied 3/4 + 4/4 to drm-misc-next.
>
> This patch doesn't even compile. Can you pls fix this up asap? Also
> pls compile-test before pushing ...
Marek says the prerequisite landed through linux-media, and that's why
it compilers on linux-next but not in drm-misc-next.
Don't do that.
Instead:
- merge all patches through one branch, with the foreign patches acked
for that merge patch
- wait until you can backmerge all the dependencies
- do a topic branch
This probably needs to be reverted here and instead merged through
linux-media. Or you wait until -rc1 and then apply it to
drm-misc-next.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
