On Sat, Oct 11, 2025 at 06:51:21PM +0200, Marek Vasut wrote: > Add _IMX8QXP suffix to Link IDs which are specific to the i.MX8QXP SoC. > This is an i.MX95 support preparatory patch. No functional change. > > Signed-off-by: Marek Vasut <[email protected]> > ---
Reviewed-by: Frank Li <[email protected]> > Cc: Abel Vesa <[email protected]> > Cc: Conor Dooley <[email protected]> > Cc: Fabio Estevam <[email protected]> > Cc: Krzysztof Kozlowski <[email protected]> > Cc: Laurent Pinchart <[email protected]> > Cc: Liu Ying <[email protected]> > Cc: Lucas Stach <[email protected]> > Cc: Peng Fan <[email protected]> > Cc: Pengutronix Kernel Team <[email protected]> > Cc: Rob Herring <[email protected]> > Cc: Shawn Guo <[email protected]> > Cc: Thomas Zimmermann <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > --- > drivers/gpu/drm/imx/dc/dc-cf.c | 4 ++-- > drivers/gpu/drm/imx/dc/dc-ed.c | 12 ++++++------ > drivers/gpu/drm/imx/dc/dc-lb.c | 14 +++++++------- > drivers/gpu/drm/imx/dc/dc-pe.h | 22 +++++++++++----------- > 4 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/imx/dc/dc-cf.c b/drivers/gpu/drm/imx/dc/dc-cf.c > index 846705534546a..6cb83182a3668 100644 > --- a/drivers/gpu/drm/imx/dc/dc-cf.c > +++ b/drivers/gpu/drm/imx/dc/dc-cf.c > @@ -123,11 +123,11 @@ static int dc_cf_bind(struct device *dev, struct device > *master, void *data) > dc_drm->cf_cont[1] = cf; > break; > case 4: > - cf->link = LINK_ID_CONSTFRAME4; > + cf->link = LINK_ID_CONSTFRAME4_MX8QXP; > dc_drm->cf_safe[0] = cf; > break; > case 5: > - cf->link = LINK_ID_CONSTFRAME5; > + cf->link = LINK_ID_CONSTFRAME5_MX8QXP; > dc_drm->cf_safe[1] = cf; > break; > } > diff --git a/drivers/gpu/drm/imx/dc/dc-ed.c b/drivers/gpu/drm/imx/dc/dc-ed.c > index a63c387a4c023..9a141c6aa0812 100644 > --- a/drivers/gpu/drm/imx/dc/dc-ed.c > +++ b/drivers/gpu/drm/imx/dc/dc-ed.c > @@ -110,12 +110,12 @@ static const enum dc_link_id src_sels[] = { > LINK_ID_NONE, > LINK_ID_CONSTFRAME0, > LINK_ID_CONSTFRAME1, > - LINK_ID_CONSTFRAME4, > - LINK_ID_CONSTFRAME5, > - LINK_ID_LAYERBLEND3, > - LINK_ID_LAYERBLEND2, > - LINK_ID_LAYERBLEND1, > - LINK_ID_LAYERBLEND0, > + LINK_ID_CONSTFRAME4_MX8QXP, > + LINK_ID_CONSTFRAME5_MX8QXP, > + LINK_ID_LAYERBLEND3_MX8QXP, > + LINK_ID_LAYERBLEND2_MX8QXP, > + LINK_ID_LAYERBLEND1_MX8QXP, > + LINK_ID_LAYERBLEND0_MX8QXP, > }; > > static inline void dc_ed_pec_enable_shden(struct dc_ed *ed) > diff --git a/drivers/gpu/drm/imx/dc/dc-lb.c b/drivers/gpu/drm/imx/dc/dc-lb.c > index 34ea61c2de87d..619353456743c 100644 > --- a/drivers/gpu/drm/imx/dc/dc-lb.c > +++ b/drivers/gpu/drm/imx/dc/dc-lb.c > @@ -124,8 +124,8 @@ static const enum dc_link_id prim_sels[] = { > LINK_ID_NONE, > LINK_ID_CONSTFRAME0, > LINK_ID_CONSTFRAME1, > - LINK_ID_CONSTFRAME4, > - LINK_ID_CONSTFRAME5, > + LINK_ID_CONSTFRAME4_MX8QXP, > + LINK_ID_CONSTFRAME5_MX8QXP, > /* > * special options: > * layerblend(n) has n special options, > @@ -133,10 +133,10 @@ static const enum dc_link_id prim_sels[] = { > * layerblend3 has 3 special options - > * layerblend0/1/2. > */ > - LINK_ID_LAYERBLEND0, > - LINK_ID_LAYERBLEND1, > - LINK_ID_LAYERBLEND2, > - LINK_ID_LAYERBLEND3, > + LINK_ID_LAYERBLEND0_MX8QXP, > + LINK_ID_LAYERBLEND1_MX8QXP, > + LINK_ID_LAYERBLEND2_MX8QXP, > + LINK_ID_LAYERBLEND3_MX8QXP, > }; > > static const enum dc_link_id sec_sels[] = { > @@ -281,7 +281,7 @@ static int dc_lb_bind(struct device *dev, struct device > *master, void *data) > } > > lb->dev = dev; > - lb->link = LINK_ID_LAYERBLEND0 + lb->id; > + lb->link = LINK_ID_LAYERBLEND0_MX8QXP + lb->id; > > dc_drm->lb[lb->id] = lb; > > diff --git a/drivers/gpu/drm/imx/dc/dc-pe.h b/drivers/gpu/drm/imx/dc/dc-pe.h > index ffeb1c7af1c9f..866859403a79d 100644 > --- a/drivers/gpu/drm/imx/dc/dc-pe.h > +++ b/drivers/gpu/drm/imx/dc/dc-pe.h > @@ -22,17 +22,17 @@ > #define DC_LB_CNT 4 > > enum dc_link_id { > - LINK_ID_NONE = 0x00, > - LINK_ID_CONSTFRAME0 = 0x0c, > - LINK_ID_CONSTFRAME4 = 0x0e, > - LINK_ID_CONSTFRAME1 = 0x10, > - LINK_ID_CONSTFRAME5 = 0x12, > - LINK_ID_FETCHWARP2 = 0x14, > - LINK_ID_FETCHLAYER0 = 0x1a, > - LINK_ID_LAYERBLEND0 = 0x21, > - LINK_ID_LAYERBLEND1 = 0x22, > - LINK_ID_LAYERBLEND2 = 0x23, > - LINK_ID_LAYERBLEND3 = 0x24, > + LINK_ID_NONE = 0x00, > + LINK_ID_CONSTFRAME0 = 0x0c, > + LINK_ID_CONSTFRAME4_MX8QXP = 0x0e, > + LINK_ID_CONSTFRAME1 = 0x10, > + LINK_ID_CONSTFRAME5_MX8QXP = 0x12, > + LINK_ID_FETCHWARP2 = 0x14, > + LINK_ID_FETCHLAYER0 = 0x1a, > + LINK_ID_LAYERBLEND0_MX8QXP = 0x21, > + LINK_ID_LAYERBLEND1_MX8QXP = 0x22, > + LINK_ID_LAYERBLEND2_MX8QXP = 0x23, > + LINK_ID_LAYERBLEND3_MX8QXP = 0x24, > }; > > enum dc_lb_mode { > -- > 2.51.0 >
