| Message ID | 20220927152704.12018-7-jason-jh.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Change mmsys compatible for mt8195 mediatek-drm | expand |
On 27/09/2022 17:27, Jason-JH.Lin wrote: > After mmsys and drm change DITHER enum to DDP_COMPONENT_DITHER0, > mmsys header can remove the useless DDP_COMPONENT_DITHER enum. > > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com> > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Chun-Kuan, I understand you will take this patch through your tree as it depends on DRM changes. We can also sync so that I take it once you merged the rest of the series. Having vdosys1 series around maybe that's better to avoid merge problems. Regards, Matthias > --- > include/linux/soc/mediatek/mtk-mmsys.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h > index d2b02bb43768..16ac0e5847f0 100644 > --- a/include/linux/soc/mediatek/mtk-mmsys.h > +++ b/include/linux/soc/mediatek/mtk-mmsys.h > @@ -16,8 +16,7 @@ enum mtk_ddp_comp_id { > DDP_COMPONENT_CCORR, > DDP_COMPONENT_COLOR0, > DDP_COMPONENT_COLOR1, > - DDP_COMPONENT_DITHER, > - DDP_COMPONENT_DITHER0 = DDP_COMPONENT_DITHER, > + DDP_COMPONENT_DITHER0, > DDP_COMPONENT_DITHER1, > DDP_COMPONENT_DP_INTF0, > DDP_COMPONENT_DP_INTF1,
Matthias Brugger <matthias.bgg@gmail.com> 於 2022年11月9日 週三 晚上7:25寫道： > > > > On 27/09/2022 17:27, Jason-JH.Lin wrote: > > After mmsys and drm change DITHER enum to DDP_COMPONENT_DITHER0, > > mmsys header can remove the useless DDP_COMPONENT_DITHER enum. > > > > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com> > > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > > Chun-Kuan, I understand you will take this patch through your tree as it depends > on DRM changes. We can also sync so that I take it once you merged the rest of > the series. Having vdosys1 series around maybe that's better to avoid merge > problems. Hi, Matthias: I do not hurry to merge patches. To prevent merge conflict, let's merge step by step. The drm patches depend on binding document patch, so I would wait for binding document merged. After drm patch merged, you could merge this patch. vdosys1 patches depend on vdosys0 patches, so just let it around. Regards, Chun-Kuang. > > Regards, > Matthias > > > --- > > include/linux/soc/mediatek/mtk-mmsys.h | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h > > index d2b02bb43768..16ac0e5847f0 100644 > > --- a/include/linux/soc/mediatek/mtk-mmsys.h > > +++ b/include/linux/soc/mediatek/mtk-mmsys.h > > @@ -16,8 +16,7 @@ enum mtk_ddp_comp_id { > > DDP_COMPONENT_CCORR, > > DDP_COMPONENT_COLOR0, > > DDP_COMPONENT_COLOR1, > > - DDP_COMPONENT_DITHER, > > - DDP_COMPONENT_DITHER0 = DDP_COMPONENT_DITHER, > > + DDP_COMPONENT_DITHER0, > > DDP_COMPONENT_DITHER1, > > DDP_COMPONENT_DP_INTF0, > > DDP_COMPONENT_DP_INTF1,
diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index d2b02bb43768..16ac0e5847f0 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -16,8 +16,7 @@ enum mtk_ddp_comp_id { DDP_COMPONENT_CCORR, DDP_COMPONENT_COLOR0, DDP_COMPONENT_COLOR1, - DDP_COMPONENT_DITHER, - DDP_COMPONENT_DITHER0 = DDP_COMPONENT_DITHER, + DDP_COMPONENT_DITHER0, DDP_COMPONENT_DITHER1, DDP_COMPONENT_DP_INTF0, DDP_COMPONENT_DP_INTF1,