mbox series

[0/1] Fix the port mux of VP2

Message ID 20240422101905.32703-1-andyshrk@163.com (mailing list archive)
Headers show
Series Fix the port mux of VP2 | expand

Message

Andy Yan April 22, 2024, 10:19 a.m. UTC
From: Andy Yan <andy.yan@rock-chips.com>


The port mux bits of VP2 should be defined by RK3568_OVL_PORT_SET__PORT2_MUX,
this maybe a copy and paste error when this driver first introduced.
Hi Heiko:
   Maybe thi is the problem you met when you porting the dsi2 driver.
I previously sent you this patch when you ask me about this issue on
email,but I'm not sure if you received it.


Andy Yan (1):
  drm/rockchip: vop2: Fix the port mux of VP2

 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Heiko Stuebner April 25, 2024, 3:19 p.m. UTC | #1
On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> From: Andy Yan <andy.yan@rock-chips.com>
> 
> 
> The port mux bits of VP2 should be defined by RK3568_OVL_PORT_SET__PORT2_MUX,
> this maybe a copy and paste error when this driver first introduced.
> Hi Heiko:
>    Maybe thi is the problem you met when you porting the dsi2 driver.
> I previously sent you this patch when you ask me about this issue on
> email,but I'm not sure if you received it.
> 
> [...]

Applied, thanks!

[1/1] drm/rockchip: vop2: Fix the port mux of VP2
      commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f

Best regards,
Diederik de Haas May 29, 2024, 3:55 p.m. UTC | #2
On Thursday, 25 April 2024 17:19:58 CEST Heiko Stuebner wrote:
> On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> > From: Andy Yan <andy.yan@rock-chips.com>
> > 
> > The port mux bits of VP2 should be defined by
> > RK3568_OVL_PORT_SET__PORT2_MUX, this maybe a copy and paste error when
> > this driver first introduced.> 
> > Hi Heiko:
> >    Maybe thi is the problem you met when you porting the dsi2 driver.
> > 
> 
> Applied, thanks!
> 
> [1/1] drm/rockchip: vop2: Fix the port mux of VP2
>       commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f

Wasn't this patch supposed to be part of 6.10-rc1?
Heiko Stuebner May 29, 2024, 4:24 p.m. UTC | #3
Am Mittwoch, 29. Mai 2024, 17:55:25 CEST schrieb Diederik de Haas:
> On Thursday, 25 April 2024 17:19:58 CEST Heiko Stuebner wrote:
> > On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> > > From: Andy Yan <andy.yan@rock-chips.com>
> > > 
> > > The port mux bits of VP2 should be defined by
> > > RK3568_OVL_PORT_SET__PORT2_MUX, this maybe a copy and paste error when
> > > this driver first introduced.> 
> > > Hi Heiko:
> > >    Maybe thi is the problem you met when you porting the dsi2 driver.
> > > 
> > 
> > Applied, thanks!
> > 
> > [1/1] drm/rockchip: vop2: Fix the port mux of VP2
> >       commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f
> 
> Wasn't this patch supposed to be part of 6.10-rc1?

Looking at the drm-misc tree, the last tag for the drm-misc to drm-main
merge is labeled drm-misc-next-2024-04-25, same day as I applied the
patch.

In theory I think -rc6 is the cutoff for drm-misc changes for mainline,
which would've been the 28th of april, but there might've been simple
hickups preventing that last merge, resulting in the patch missing an
early cutoff.


On the other hand, somehow Torvald's tree actually has this commit [0],
just with a "Notice: this object is not reachable from any branch."
Possibly some drm-merge-mayhem?

All very confusing.

@Thomas, @Marten: do you possible have an idea what might've happened?


Heiko




[0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2bdb481bf7a93c22b9fea8daefa2834aab23a70f