* [PATCH 0/2] drm: xlnx: add some functions
@ 2021-05-13 11:45 quanyang.wang
2021-05-13 11:45 ` [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code quanyang.wang
2021-05-13 11:45 ` [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register quanyang.wang
0 siblings, 2 replies; 7+ messages in thread
From: quanyang.wang @ 2021-05-13 11:45 UTC (permalink / raw)
To: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek
Cc: dri-devel, linux-arm-kernel, linux-kernel, Quanyang Wang
From: Quanyang Wang <quanyang.wang@windriver.com>
The patch "drm: xlnx: add is_layer_vid() to simplify the code" is to
simplify the code which judge the layer type.
The patch "drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register"
is to consolidate the code that can configure vid/gfx/audio to output
different mode (live/mem/disable/tpg) in one function "zynqmp_disp_avbuf_output_select".
Thanks,
Quanyang
Quanyang Wang (2):
drm: xlnx: add is_layer_vid() to simplify the code
drm: xlnx: consolidate the functions which programming
AUDIO_VIDEO_SELECT register
drivers/gpu/drm/xlnx/zynqmp_disp.c | 191 ++++++++++++++----------
drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 15 +-
2 files changed, 116 insertions(+), 90 deletions(-)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code 2021-05-13 11:45 [PATCH 0/2] drm: xlnx: add some functions quanyang.wang @ 2021-05-13 11:45 ` quanyang.wang 2021-05-17 16:48 ` Paul Cercueil 2021-05-13 11:45 ` [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register quanyang.wang 1 sibling, 1 reply; 7+ messages in thread From: quanyang.wang @ 2021-05-13 11:45 UTC (permalink / raw) To: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek Cc: dri-devel, linux-arm-kernel, linux-kernel, Quanyang Wang From: Quanyang Wang <quanyang.wang@windriver.com> Add a new function is_layer_vid() to simplify the code that judges if a layer is the video layer. Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 39 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 109d627968ac..c55e24412f8c 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -434,30 +434,35 @@ static void zynqmp_disp_avbuf_write(struct zynqmp_disp_avbuf *avbuf, writel(val, avbuf->base + reg); } +static bool is_layer_vid(struct zynqmp_disp_layer *layer) +{ + return (layer->id == ZYNQMP_DISP_LAYER_VID) ? true : false; +} + /** * zynqmp_disp_avbuf_set_format - Set the input format for a layer * @avbuf: Audio/video buffer manager - * @layer: The layer ID + * @layer: The layer * @fmt: The format information * * Set the video buffer manager format for @layer to @fmt. */ static void zynqmp_disp_avbuf_set_format(struct zynqmp_disp_avbuf *avbuf, - enum zynqmp_disp_layer_id layer, + struct zynqmp_disp_layer *layer, const struct zynqmp_disp_format *fmt) { unsigned int i; u32 val; val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_FMT); - val &= layer == ZYNQMP_DISP_LAYER_VID + val &= is_layer_vid(layer) ? ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK : ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK; val |= fmt->buf_fmt; zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_FMT, val); for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) { - unsigned int reg = layer == ZYNQMP_DISP_LAYER_VID + unsigned int reg = is_layer_vid(layer) ? ZYNQMP_DISP_AV_BUF_VID_COMP_SF(i) : ZYNQMP_DISP_AV_BUF_GFX_COMP_SF(i); @@ -573,19 +578,19 @@ static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf *avbuf) /** * zynqmp_disp_avbuf_enable_video - Enable a video layer * @avbuf: Audio/video buffer manager - * @layer: The layer ID + * @layer: The layer * @mode: Operating mode of layer * * Enable the video/graphics buffer for @layer. */ static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf *avbuf, - enum zynqmp_disp_layer_id layer, + struct zynqmp_disp_layer *layer, enum zynqmp_disp_layer_mode mode) { u32 val; val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - if (layer == ZYNQMP_DISP_LAYER_VID) { + if (is_layer_vid(layer)) { val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; if (mode == ZYNQMP_DISP_LAYER_NONLIVE) val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; @@ -605,17 +610,17 @@ static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf *avbuf, /** * zynqmp_disp_avbuf_disable_video - Disable a video layer * @avbuf: Audio/video buffer manager - * @layer: The layer ID + * @layer: The layer * * Disable the video/graphics buffer for @layer. */ static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf *avbuf, - enum zynqmp_disp_layer_id layer) + struct zynqmp_disp_layer *layer) { u32 val; val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - if (layer == ZYNQMP_DISP_LAYER_VID) { + if (is_layer_vid(layer)) { val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; } else { @@ -807,7 +812,7 @@ static void zynqmp_disp_blend_layer_set_csc(struct zynqmp_disp_blend *blend, } } - if (layer->id == ZYNQMP_DISP_LAYER_VID) + if (is_layer_vid(layer)) reg = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF(0); else reg = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF(0); @@ -818,7 +823,7 @@ static void zynqmp_disp_blend_layer_set_csc(struct zynqmp_disp_blend *blend, zynqmp_disp_blend_write(blend, reg + 8, coeffs[i + swap[2]]); } - if (layer->id == ZYNQMP_DISP_LAYER_VID) + if (is_layer_vid(layer)) reg = ZYNQMP_DISP_V_BLEND_IN1CSC_OFFSET(0); else reg = ZYNQMP_DISP_V_BLEND_IN2CSC_OFFSET(0); @@ -1025,7 +1030,7 @@ zynqmp_disp_layer_find_format(struct zynqmp_disp_layer *layer, */ static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) { - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer->id, + zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, ZYNQMP_DISP_LAYER_NONLIVE); zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); @@ -1046,7 +1051,7 @@ static void zynqmp_disp_layer_disable(struct zynqmp_disp_layer *layer) for (i = 0; i < layer->drm_fmt->num_planes; i++) dmaengine_terminate_sync(layer->dmas[i].chan); - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer->id); + zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); } @@ -1067,7 +1072,7 @@ static void zynqmp_disp_layer_set_format(struct zynqmp_disp_layer *layer, layer->disp_fmt = zynqmp_disp_layer_find_format(layer, info->format); layer->drm_fmt = info; - zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer->id, + zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer, layer->disp_fmt); /* @@ -1244,8 +1249,8 @@ static int zynqmp_disp_create_planes(struct zynqmp_disp *disp) drm_formats[j] = layer->info->formats[j].drm_fmt; /* Graphics layer is primary, and video layer is overlay. */ - type = i == ZYNQMP_DISP_LAYER_GFX - ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; + type = is_layer_vid(layer) + ? DRM_PLANE_TYPE_OVERLAY : DRM_PLANE_TYPE_PRIMARY; ret = drm_universal_plane_init(disp->drm, &layer->plane, 0, &zynqmp_disp_plane_funcs, drm_formats, -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code 2021-05-13 11:45 ` [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code quanyang.wang @ 2021-05-17 16:48 ` Paul Cercueil 2021-05-18 5:14 ` quanyang.wang 0 siblings, 1 reply; 7+ messages in thread From: Paul Cercueil @ 2021-05-17 16:48 UTC (permalink / raw) To: quanyang.wang Cc: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek, dri-devel, linux-arm-kernel, linux-kernel Hi Quanyang, Le jeu., mai 13 2021 at 19:45:39 +0800, quanyang.wang@windriver.com a écrit : > From: Quanyang Wang <quanyang.wang@windriver.com> > > Add a new function is_layer_vid() to simplify the code that > judges if a layer is the video layer. > > Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> > --- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 39 > +++++++++++++++++------------- > 1 file changed, 22 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c > b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index 109d627968ac..c55e24412f8c 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -434,30 +434,35 @@ static void zynqmp_disp_avbuf_write(struct > zynqmp_disp_avbuf *avbuf, > writel(val, avbuf->base + reg); > } > > +static bool is_layer_vid(struct zynqmp_disp_layer *layer) 'layer' should be const. > +{ > + return (layer->id == ZYNQMP_DISP_LAYER_VID) ? true : false; return layer->id == ZYNQMP_DISP_LAYER_VID; The rest looks good. With these fixed: Acked-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > +} > + > /** > * zynqmp_disp_avbuf_set_format - Set the input format for a layer > * @avbuf: Audio/video buffer manager > - * @layer: The layer ID > + * @layer: The layer > * @fmt: The format information > * > * Set the video buffer manager format for @layer to @fmt. > */ > static void zynqmp_disp_avbuf_set_format(struct zynqmp_disp_avbuf > *avbuf, > - enum zynqmp_disp_layer_id layer, > + struct zynqmp_disp_layer *layer, > const struct zynqmp_disp_format *fmt) > { > unsigned int i; > u32 val; > > val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_FMT); > - val &= layer == ZYNQMP_DISP_LAYER_VID > + val &= is_layer_vid(layer) > ? ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK > : ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK; > val |= fmt->buf_fmt; > zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_FMT, val); > > for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) { > - unsigned int reg = layer == ZYNQMP_DISP_LAYER_VID > + unsigned int reg = is_layer_vid(layer) > ? ZYNQMP_DISP_AV_BUF_VID_COMP_SF(i) > : ZYNQMP_DISP_AV_BUF_GFX_COMP_SF(i); > > @@ -573,19 +578,19 @@ static void > zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf *avbuf) > /** > * zynqmp_disp_avbuf_enable_video - Enable a video layer > * @avbuf: Audio/video buffer manager > - * @layer: The layer ID > + * @layer: The layer > * @mode: Operating mode of layer > * > * Enable the video/graphics buffer for @layer. > */ > static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf > *avbuf, > - enum zynqmp_disp_layer_id layer, > + struct zynqmp_disp_layer *layer, > enum zynqmp_disp_layer_mode mode) > { > u32 val; > > val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - if (layer == ZYNQMP_DISP_LAYER_VID) { > + if (is_layer_vid(layer)) { > val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > if (mode == ZYNQMP_DISP_LAYER_NONLIVE) > val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; > @@ -605,17 +610,17 @@ static void > zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf *avbuf, > /** > * zynqmp_disp_avbuf_disable_video - Disable a video layer > * @avbuf: Audio/video buffer manager > - * @layer: The layer ID > + * @layer: The layer > * > * Disable the video/graphics buffer for @layer. > */ > static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf > *avbuf, > - enum zynqmp_disp_layer_id layer) > + struct zynqmp_disp_layer *layer) > { > u32 val; > > val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - if (layer == ZYNQMP_DISP_LAYER_VID) { > + if (is_layer_vid(layer)) { > val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; > } else { > @@ -807,7 +812,7 @@ static void > zynqmp_disp_blend_layer_set_csc(struct zynqmp_disp_blend *blend, > } > } > > - if (layer->id == ZYNQMP_DISP_LAYER_VID) > + if (is_layer_vid(layer)) > reg = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF(0); > else > reg = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF(0); > @@ -818,7 +823,7 @@ static void > zynqmp_disp_blend_layer_set_csc(struct zynqmp_disp_blend *blend, > zynqmp_disp_blend_write(blend, reg + 8, coeffs[i + swap[2]]); > } > > - if (layer->id == ZYNQMP_DISP_LAYER_VID) > + if (is_layer_vid(layer)) > reg = ZYNQMP_DISP_V_BLEND_IN1CSC_OFFSET(0); > else > reg = ZYNQMP_DISP_V_BLEND_IN2CSC_OFFSET(0); > @@ -1025,7 +1030,7 @@ zynqmp_disp_layer_find_format(struct > zynqmp_disp_layer *layer, > */ > static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) > { > - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer->id, > + zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, > ZYNQMP_DISP_LAYER_NONLIVE); > zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); > > @@ -1046,7 +1051,7 @@ static void zynqmp_disp_layer_disable(struct > zynqmp_disp_layer *layer) > for (i = 0; i < layer->drm_fmt->num_planes; i++) > dmaengine_terminate_sync(layer->dmas[i].chan); > > - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer->id); > + zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); > zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); > } > > @@ -1067,7 +1072,7 @@ static void zynqmp_disp_layer_set_format(struct > zynqmp_disp_layer *layer, > layer->disp_fmt = zynqmp_disp_layer_find_format(layer, > info->format); > layer->drm_fmt = info; > > - zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer->id, > + zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer, > layer->disp_fmt); > > /* > @@ -1244,8 +1249,8 @@ static int zynqmp_disp_create_planes(struct > zynqmp_disp *disp) > drm_formats[j] = layer->info->formats[j].drm_fmt; > > /* Graphics layer is primary, and video layer is overlay. */ > - type = i == ZYNQMP_DISP_LAYER_GFX > - ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; > + type = is_layer_vid(layer) > + ? DRM_PLANE_TYPE_OVERLAY : DRM_PLANE_TYPE_PRIMARY; > ret = drm_universal_plane_init(disp->drm, &layer->plane, 0, > &zynqmp_disp_plane_funcs, > drm_formats, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code 2021-05-17 16:48 ` Paul Cercueil @ 2021-05-18 5:14 ` quanyang.wang 0 siblings, 0 replies; 7+ messages in thread From: quanyang.wang @ 2021-05-18 5:14 UTC (permalink / raw) To: Paul Cercueil Cc: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek, dri-devel, linux-arm-kernel, linux-kernel Hi Paul, Thank you for your review. I will update these in V2 patch. Thanks, Quanyang On 5/18/21 12:48 AM, Paul Cercueil wrote: > Hi Quanyang, > > Le jeu., mai 13 2021 at 19:45:39 +0800, quanyang.wang@windriver.com a > écrit : >> From: Quanyang Wang <quanyang.wang@windriver.com> >> >> Add a new function is_layer_vid() to simplify the code that >> judges if a layer is the video layer. >> >> Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> >> --- >> drivers/gpu/drm/xlnx/zynqmp_disp.c | 39 +++++++++++++++++------------- >> 1 file changed, 22 insertions(+), 17 deletions(-) >> >> diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c >> b/drivers/gpu/drm/xlnx/zynqmp_disp.c >> index 109d627968ac..c55e24412f8c 100644 >> --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c >> +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c >> @@ -434,30 +434,35 @@ static void zynqmp_disp_avbuf_write(struct >> zynqmp_disp_avbuf *avbuf, >> writel(val, avbuf->base + reg); >> } >> >> +static bool is_layer_vid(struct zynqmp_disp_layer *layer) > > 'layer' should be const. > >> +{ >> + return (layer->id == ZYNQMP_DISP_LAYER_VID) ? true : false; > > return layer->id == ZYNQMP_DISP_LAYER_VID; > > The rest looks good. > > With these fixed: > Acked-by: Paul Cercueil <paul@crapouillou.net> > > Cheers, > -Paul > >> +} >> + >> /** >> * zynqmp_disp_avbuf_set_format - Set the input format for a layer >> * @avbuf: Audio/video buffer manager >> - * @layer: The layer ID >> + * @layer: The layer >> * @fmt: The format information >> * >> * Set the video buffer manager format for @layer to @fmt. >> */ >> static void zynqmp_disp_avbuf_set_format(struct zynqmp_disp_avbuf >> *avbuf, >> - enum zynqmp_disp_layer_id layer, >> + struct zynqmp_disp_layer *layer, >> const struct zynqmp_disp_format *fmt) >> { >> unsigned int i; >> u32 val; >> >> val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_FMT); >> - val &= layer == ZYNQMP_DISP_LAYER_VID >> + val &= is_layer_vid(layer) >> ? ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK >> : ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK; >> val |= fmt->buf_fmt; >> zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_FMT, val); >> >> for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) { >> - unsigned int reg = layer == ZYNQMP_DISP_LAYER_VID >> + unsigned int reg = is_layer_vid(layer) >> ? ZYNQMP_DISP_AV_BUF_VID_COMP_SF(i) >> : ZYNQMP_DISP_AV_BUF_GFX_COMP_SF(i); >> >> @@ -573,19 +578,19 @@ static void >> zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf *avbuf) >> /** >> * zynqmp_disp_avbuf_enable_video - Enable a video layer >> * @avbuf: Audio/video buffer manager >> - * @layer: The layer ID >> + * @layer: The layer >> * @mode: Operating mode of layer >> * >> * Enable the video/graphics buffer for @layer. >> */ >> static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf >> *avbuf, >> - enum zynqmp_disp_layer_id layer, >> + struct zynqmp_disp_layer *layer, >> enum zynqmp_disp_layer_mode mode) >> { >> u32 val; >> >> val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - if (layer == ZYNQMP_DISP_LAYER_VID) { >> + if (is_layer_vid(layer)) { >> val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; >> if (mode == ZYNQMP_DISP_LAYER_NONLIVE) >> val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; >> @@ -605,17 +610,17 @@ static void >> zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf *avbuf, >> /** >> * zynqmp_disp_avbuf_disable_video - Disable a video layer >> * @avbuf: Audio/video buffer manager >> - * @layer: The layer ID >> + * @layer: The layer >> * >> * Disable the video/graphics buffer for @layer. >> */ >> static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf >> *avbuf, >> - enum zynqmp_disp_layer_id layer) >> + struct zynqmp_disp_layer *layer) >> { >> u32 val; >> >> val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - if (layer == ZYNQMP_DISP_LAYER_VID) { >> + if (is_layer_vid(layer)) { >> val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; >> val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; >> } else { >> @@ -807,7 +812,7 @@ static void zynqmp_disp_blend_layer_set_csc(struct >> zynqmp_disp_blend *blend, >> } >> } >> >> - if (layer->id == ZYNQMP_DISP_LAYER_VID) >> + if (is_layer_vid(layer)) >> reg = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF(0); >> else >> reg = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF(0); >> @@ -818,7 +823,7 @@ static void zynqmp_disp_blend_layer_set_csc(struct >> zynqmp_disp_blend *blend, >> zynqmp_disp_blend_write(blend, reg + 8, coeffs[i + swap[2]]); >> } >> >> - if (layer->id == ZYNQMP_DISP_LAYER_VID) >> + if (is_layer_vid(layer)) >> reg = ZYNQMP_DISP_V_BLEND_IN1CSC_OFFSET(0); >> else >> reg = ZYNQMP_DISP_V_BLEND_IN2CSC_OFFSET(0); >> @@ -1025,7 +1030,7 @@ zynqmp_disp_layer_find_format(struct >> zynqmp_disp_layer *layer, >> */ >> static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) >> { >> - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer->id, >> + zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, >> ZYNQMP_DISP_LAYER_NONLIVE); >> zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); >> >> @@ -1046,7 +1051,7 @@ static void zynqmp_disp_layer_disable(struct >> zynqmp_disp_layer *layer) >> for (i = 0; i < layer->drm_fmt->num_planes; i++) >> dmaengine_terminate_sync(layer->dmas[i].chan); >> >> - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer->id); >> + zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); >> zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); >> } >> >> @@ -1067,7 +1072,7 @@ static void zynqmp_disp_layer_set_format(struct >> zynqmp_disp_layer *layer, >> layer->disp_fmt = zynqmp_disp_layer_find_format(layer, >> info->format); >> layer->drm_fmt = info; >> >> - zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer->id, >> + zynqmp_disp_avbuf_set_format(&layer->disp->avbuf, layer, >> layer->disp_fmt); >> >> /* >> @@ -1244,8 +1249,8 @@ static int zynqmp_disp_create_planes(struct >> zynqmp_disp *disp) >> drm_formats[j] = layer->info->formats[j].drm_fmt; >> >> /* Graphics layer is primary, and video layer is overlay. */ >> - type = i == ZYNQMP_DISP_LAYER_GFX >> - ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; >> + type = is_layer_vid(layer) >> + ? DRM_PLANE_TYPE_OVERLAY : DRM_PLANE_TYPE_PRIMARY; >> ret = drm_universal_plane_init(disp->drm, &layer->plane, 0, >> &zynqmp_disp_plane_funcs, >> drm_formats, > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register 2021-05-13 11:45 [PATCH 0/2] drm: xlnx: add some functions quanyang.wang 2021-05-13 11:45 ` [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code quanyang.wang @ 2021-05-13 11:45 ` quanyang.wang 2021-05-17 17:09 ` Paul Cercueil 1 sibling, 1 reply; 7+ messages in thread From: quanyang.wang @ 2021-05-13 11:45 UTC (permalink / raw) To: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek Cc: dri-devel, linux-arm-kernel, linux-kernel, Quanyang Wang From: Quanyang Wang <quanyang.wang@windriver.com> For now, the functions zynqmp_disp_avbuf_enable/disable_audio and zynqmp_disp_avbuf_enable/disable_video are all programming the register AV_BUF_OUTPUT_AUDIO_VIDEO_SELECT to select the output for audio or video. And in the future, many drm properties (like video_tpg, audio_tpg, audio_pl, etc) also need to access it. So let's introduce some variables of enum type and consolidate the code to unify handling this. Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 166 ++++++++++++++---------- drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 15 +-- 2 files changed, 101 insertions(+), 80 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index c55e24412f8c..a82bc88a98aa 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -102,12 +102,39 @@ enum zynqmp_disp_layer_id { /** * enum zynqmp_disp_layer_mode - Layer mode - * @ZYNQMP_DISP_LAYER_NONLIVE: non-live (memory) mode + * @ZYNQMP_DISP_LAYER_MEM: memory mode * @ZYNQMP_DISP_LAYER_LIVE: live (stream) mode + * @ZYNQMP_DISP_LAYER_TPG: tpg mode (only for video layer) + * @ZYNQMP_DISP_LAYER_DISABLE: disable mode */ enum zynqmp_disp_layer_mode { - ZYNQMP_DISP_LAYER_NONLIVE, - ZYNQMP_DISP_LAYER_LIVE + ZYNQMP_DISP_LAYER_MEM, + ZYNQMP_DISP_LAYER_LIVE, + ZYNQMP_DISP_LAYER_TPG, + ZYNQMP_DISP_LAYER_DISABLE +}; + +enum avbuf_vid_mode { + VID_MODE_LIVE, + VID_MODE_MEM, + VID_MODE_TPG, + VID_MODE_NONE +}; + +enum avbuf_gfx_mode { + GFX_MODE_DISABLE, + GFX_MODE_MEM, + GFX_MODE_LIVE, + GFX_MODE_NONE +}; + +enum avbuf_aud_mode { + AUD1_MODE_LIVE, + AUD1_MODE_MEM, + AUD1_MODE_TPG, + AUD1_MODE_DISABLE, + AUD2_MODE_DISABLE, + AUD2_MODE_ENABLE }; /** @@ -542,92 +569,98 @@ static void zynqmp_disp_avbuf_disable_channels(struct zynqmp_disp_avbuf *avbuf) } /** - * zynqmp_disp_avbuf_enable_audio - Enable audio + * zynqmp_disp_avbuf_output_select - Select the buffer manager outputs * @avbuf: Audio/video buffer manager + * @layer: The layer + * @mode: The mode for this layer * - * Enable all audio buffers with a non-live (memory) source. + * Select the buffer manager outputs for @layer. */ -static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf *avbuf) +static void zynqmp_disp_avbuf_output_select(struct zynqmp_disp_avbuf *avbuf, + struct zynqmp_disp_layer *layer, u32 mode) { - u32 val; - - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); + u32 reg; + + reg = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); + /* Select audio mode when the layer is NULL */ + if (layer == NULL) { + if (mode >= AUD2_MODE_DISABLE) { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK; + reg |= (mode - AUD2_MODE_DISABLE) + << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT; + } else { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT; + } + } else if (is_layer_vid(layer)) { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT; + } else { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT; + } + zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); } /** - * zynqmp_disp_avbuf_disable_audio - Disable audio + * zynqmp_disp_avbuf_enable_audio - Enable audio * @avbuf: Audio/video buffer manager * - * Disable all audio buffers. + * Enable all audio buffers. */ -static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf *avbuf) +static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf *avbuf) { - u32 val; - - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE; - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_MEM); + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_ENABLE); } /** - * zynqmp_disp_avbuf_enable_video - Enable a video layer + * zynqmp_disp_avbuf_disable_audio - Disable audio * @avbuf: Audio/video buffer manager - * @layer: The layer - * @mode: Operating mode of layer * - * Enable the video/graphics buffer for @layer. + * Disable all audio buffers. */ -static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf *avbuf, - struct zynqmp_disp_layer *layer, - enum zynqmp_disp_layer_mode mode) +static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf *avbuf) { - u32 val; - - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - if (is_layer_vid(layer)) { - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; - else - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE; - } else { - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; - else - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE; - } - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_DISABLE); + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_DISABLE); } /** - * zynqmp_disp_avbuf_disable_video - Disable a video layer - * @avbuf: Audio/video buffer manager + * zynqmp_disp_avbuf_set_layer_output -Set layer output * @layer: The layer + * @mode: The layer mode * - * Disable the video/graphics buffer for @layer. + * Set output for @layer */ -static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf *avbuf, - struct zynqmp_disp_layer *layer) +static void zynqmp_disp_avbuf_set_layer_output(struct zynqmp_disp_layer *layer, + enum zynqmp_disp_layer_mode mode) { - u32 val; - - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); - if (is_layer_vid(layer)) { - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; - } else { - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE; + int val; + struct zynqmp_disp *disp = layer->disp; + + switch (mode) { + case ZYNQMP_DISP_LAYER_LIVE: + val = is_layer_vid(layer) ? VID_MODE_LIVE : GFX_MODE_LIVE; + break; + case ZYNQMP_DISP_LAYER_MEM: + val = is_layer_vid(layer) ? VID_MODE_MEM : GFX_MODE_MEM; + break; + case ZYNQMP_DISP_LAYER_TPG: + if (!is_layer_vid(layer)) { + dev_err(disp->dev, "gfx layer has no tpg mode\n"); + return; + } + val = VID_MODE_TPG; + break; + case ZYNQMP_DISP_LAYER_DISABLE: + val = is_layer_vid(layer) ? VID_MODE_NONE : GFX_MODE_DISABLE; + break; + default: + dev_err(disp->dev, "invalid layer mode\n"); + return; } - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); + zynqmp_disp_avbuf_output_select(&disp->avbuf, layer, val); } /** @@ -1030,11 +1063,10 @@ zynqmp_disp_layer_find_format(struct zynqmp_disp_layer *layer, */ static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) { - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, - ZYNQMP_DISP_LAYER_NONLIVE); + zynqmp_disp_avbuf_set_layer_output(layer, ZYNQMP_DISP_LAYER_MEM); zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); - layer->mode = ZYNQMP_DISP_LAYER_NONLIVE; + layer->mode = ZYNQMP_DISP_LAYER_MEM; } /** @@ -1051,7 +1083,7 @@ static void zynqmp_disp_layer_disable(struct zynqmp_disp_layer *layer) for (i = 0; i < layer->drm_fmt->num_planes; i++) dmaengine_terminate_sync(layer->dmas[i].chan); - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); + zynqmp_disp_avbuf_set_layer_output(layer, ZYNQMP_DISP_LAYER_DISABLE); zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); } diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h index f92a006d5070..dad3e356d9ab 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h +++ b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h @@ -120,23 +120,12 @@ #define ZYNQMP_DISP_AV_BUF_OUTPUT 0x70 #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT 0 #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK (0x3 << 0) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE (0 << 0) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM (1 << 0) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN (2 << 0) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE (3 << 0) #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT 2 #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK (0x3 << 2) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE (0 << 2) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM (1 << 2) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE (2 << 2) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_NONE (3 << 2) #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT 4 #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK (0x3 << 4) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PL (0 << 4) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM (1 << 4) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PATTERN (2 << 4) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE (3 << 4) -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN BIT(6) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK (0x1 << 6) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT 6 #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT0 0x74 #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT1 0x78 #define ZYNQMP_DISP_AV_BUF_PATTERN_GEN_SELECT 0x100 -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register 2021-05-13 11:45 ` [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register quanyang.wang @ 2021-05-17 17:09 ` Paul Cercueil 2021-05-18 5:22 ` quanyang.wang 0 siblings, 1 reply; 7+ messages in thread From: Paul Cercueil @ 2021-05-17 17:09 UTC (permalink / raw) To: quanyang.wang Cc: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek, dri-devel, linux-arm-kernel, linux-kernel Hi, Le jeu., mai 13 2021 at 19:45:40 +0800, quanyang.wang@windriver.com a écrit : > From: Quanyang Wang <quanyang.wang@windriver.com> > > For now, the functions zynqmp_disp_avbuf_enable/disable_audio and > zynqmp_disp_avbuf_enable/disable_video are all programming the > register > AV_BUF_OUTPUT_AUDIO_VIDEO_SELECT to select the output for audio or > video. > And in the future, many drm properties (like video_tpg, audio_tpg, > audio_pl, etc) also need to access it. So let's introduce some > variables > of enum type and consolidate the code to unify handling this. > > Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> > --- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 166 > ++++++++++++++---------- > drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 15 +-- > 2 files changed, 101 insertions(+), 80 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c > b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index c55e24412f8c..a82bc88a98aa 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -102,12 +102,39 @@ enum zynqmp_disp_layer_id { > > /** > * enum zynqmp_disp_layer_mode - Layer mode > - * @ZYNQMP_DISP_LAYER_NONLIVE: non-live (memory) mode > + * @ZYNQMP_DISP_LAYER_MEM: memory mode > * @ZYNQMP_DISP_LAYER_LIVE: live (stream) mode > + * @ZYNQMP_DISP_LAYER_TPG: tpg mode (only for video layer) > + * @ZYNQMP_DISP_LAYER_DISABLE: disable mode > */ > enum zynqmp_disp_layer_mode { > - ZYNQMP_DISP_LAYER_NONLIVE, > - ZYNQMP_DISP_LAYER_LIVE > + ZYNQMP_DISP_LAYER_MEM, > + ZYNQMP_DISP_LAYER_LIVE, > + ZYNQMP_DISP_LAYER_TPG, > + ZYNQMP_DISP_LAYER_DISABLE > +}; > + > +enum avbuf_vid_mode { > + VID_MODE_LIVE, > + VID_MODE_MEM, > + VID_MODE_TPG, > + VID_MODE_NONE > +}; > + > +enum avbuf_gfx_mode { > + GFX_MODE_DISABLE, > + GFX_MODE_MEM, > + GFX_MODE_LIVE, > + GFX_MODE_NONE > +}; > + > +enum avbuf_aud_mode { > + AUD1_MODE_LIVE, > + AUD1_MODE_MEM, > + AUD1_MODE_TPG, > + AUD1_MODE_DISABLE, > + AUD2_MODE_DISABLE, > + AUD2_MODE_ENABLE > }; > > /** > @@ -542,92 +569,98 @@ static void > zynqmp_disp_avbuf_disable_channels(struct zynqmp_disp_avbuf *avbuf) > } > > /** > - * zynqmp_disp_avbuf_enable_audio - Enable audio > + * zynqmp_disp_avbuf_output_select - Select the buffer manager > outputs > * @avbuf: Audio/video buffer manager > + * @layer: The layer > + * @mode: The mode for this layer > * > - * Enable all audio buffers with a non-live (memory) source. > + * Select the buffer manager outputs for @layer. > */ > -static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf > *avbuf) > +static void zynqmp_disp_avbuf_output_select(struct zynqmp_disp_avbuf > *avbuf, > + struct zynqmp_disp_layer *layer, u32 mode) You can put 'mode' on a new line to avoid getting over 80 characters. > { > - u32 val; > - > - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; > - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); > + u32 reg; > + > + reg = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); Empty line here (spacing before comment) > + /* Select audio mode when the layer is NULL */ > + if (layer == NULL) { > + if (mode >= AUD2_MODE_DISABLE) { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK; > + reg |= (mode - AUD2_MODE_DISABLE) > + << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT; Please consider using the FIELD_PREP() macro from <linux/bitfield.h>. Then you can get rid of your *_SHIFT macros. > + } else { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; > + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT; > + } > + } else if (is_layer_vid(layer)) { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT; > + } else { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; > + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT; > + } Empty line here (spacing after block) > + zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > } > > /** > - * zynqmp_disp_avbuf_disable_audio - Disable audio > + * zynqmp_disp_avbuf_enable_audio - Enable audio > * @avbuf: Audio/video buffer manager > * > - * Disable all audio buffers. > + * Enable all audio buffers. > */ > -static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf > *avbuf) > +static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf > *avbuf) > { > - u32 val; > - > - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE; Same as above with FIELD_PREP(). > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; > - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); > + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_MEM); > + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_ENABLE); > } > > /** > - * zynqmp_disp_avbuf_enable_video - Enable a video layer > + * zynqmp_disp_avbuf_disable_audio - Disable audio > * @avbuf: Audio/video buffer manager > - * @layer: The layer > - * @mode: Operating mode of layer > * > - * Enable the video/graphics buffer for @layer. > + * Disable all audio buffers. > */ > -static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf > *avbuf, > - struct zynqmp_disp_layer *layer, > - enum zynqmp_disp_layer_mode mode) > +static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf > *avbuf) > { > - u32 val; > - > - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - if (is_layer_vid(layer)) { > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; > - else > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE; > - } else { > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; > - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; > - else > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE; > - } > - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); > + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_DISABLE); > + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_DISABLE); > } > > /** > - * zynqmp_disp_avbuf_disable_video - Disable a video layer > - * @avbuf: Audio/video buffer manager > + * zynqmp_disp_avbuf_set_layer_output -Set layer output You're missing a space after the dash character. > * @layer: The layer > + * @mode: The layer mode > * > - * Disable the video/graphics buffer for @layer. > + * Set output for @layer > */ > -static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf > *avbuf, > - struct zynqmp_disp_layer *layer) > +static void zynqmp_disp_avbuf_set_layer_output(struct > zynqmp_disp_layer *layer, > + enum zynqmp_disp_layer_mode mode) > { > - u32 val; > - > - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > - if (is_layer_vid(layer)) { > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; > - } else { > - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; > - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE; > + int val; > + struct zynqmp_disp *disp = layer->disp; I'd swap these two lines above - variables are usually defined in "reverse christmas tree" order, the longest line first, the smallest line last. No big deal though. > + > + switch (mode) { > + case ZYNQMP_DISP_LAYER_LIVE: > + val = is_layer_vid(layer) ? VID_MODE_LIVE : GFX_MODE_LIVE; > + break; > + case ZYNQMP_DISP_LAYER_MEM: > + val = is_layer_vid(layer) ? VID_MODE_MEM : GFX_MODE_MEM; > + break; > + case ZYNQMP_DISP_LAYER_TPG: > + if (!is_layer_vid(layer)) { > + dev_err(disp->dev, "gfx layer has no tpg mode\n"); > + return; > + } > + val = VID_MODE_TPG; > + break; > + case ZYNQMP_DISP_LAYER_DISABLE: > + val = is_layer_vid(layer) ? VID_MODE_NONE : GFX_MODE_DISABLE; > + break; > + default: > + dev_err(disp->dev, "invalid layer mode\n"); > + return; > } > - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); While you're at it, you can add an empty line here (spacing after block) > + zynqmp_disp_avbuf_output_select(&disp->avbuf, layer, val); > } > > /** > @@ -1030,11 +1063,10 @@ zynqmp_disp_layer_find_format(struct > zynqmp_disp_layer *layer, > */ > static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) > { > - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, > - ZYNQMP_DISP_LAYER_NONLIVE); > + zynqmp_disp_avbuf_set_layer_output(layer, ZYNQMP_DISP_LAYER_MEM); > zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); > > - layer->mode = ZYNQMP_DISP_LAYER_NONLIVE; > + layer->mode = ZYNQMP_DISP_LAYER_MEM; > } > > /** > @@ -1051,7 +1083,7 @@ static void zynqmp_disp_layer_disable(struct > zynqmp_disp_layer *layer) > for (i = 0; i < layer->drm_fmt->num_planes; i++) > dmaengine_terminate_sync(layer->dmas[i].chan); > > - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); > + zynqmp_disp_avbuf_set_layer_output(layer, > ZYNQMP_DISP_LAYER_DISABLE); > zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); > } > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > index f92a006d5070..dad3e356d9ab 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > @@ -120,23 +120,12 @@ > #define ZYNQMP_DISP_AV_BUF_OUTPUT 0x70 > #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT 0 > #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK (0x3 << 0) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE (0 << 0) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM (1 << 0) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN (2 << 0) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE (3 << 0) > #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT 2 > #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK (0x3 << 2) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE (0 << 2) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM (1 << 2) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE (2 << 2) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_NONE (3 << 2) > #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT 4 > #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK (0x3 << 4) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PL (0 << 4) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM (1 << 4) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PATTERN (2 << 4) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE (3 << 4) > -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN BIT(6) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK (0x1 << 6) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT 6 Please use BIT() or GENMASK(). You don't need the _SHIFT macros if you use FIELD_PREP() / FIELD_GET(). Cheers, -Paul > #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT0 0x74 > #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT1 0x78 > #define ZYNQMP_DISP_AV_BUF_PATTERN_GEN_SELECT 0x100 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register 2021-05-17 17:09 ` Paul Cercueil @ 2021-05-18 5:22 ` quanyang.wang 0 siblings, 0 replies; 7+ messages in thread From: quanyang.wang @ 2021-05-18 5:22 UTC (permalink / raw) To: Paul Cercueil Cc: Hyun Kwon, Laurent Pinchart, David Airlie, Daniel Vetter, Michal Simek, dri-devel, linux-arm-kernel, linux-kernel Hi Paul, Thank you for your review. I will update all of this in V2. Thanks, Quanyang On 5/18/21 1:09 AM, Paul Cercueil wrote: > Hi, > > Le jeu., mai 13 2021 at 19:45:40 +0800, quanyang.wang@windriver.com a > écrit : >> From: Quanyang Wang <quanyang.wang@windriver.com> >> >> For now, the functions zynqmp_disp_avbuf_enable/disable_audio and >> zynqmp_disp_avbuf_enable/disable_video are all programming the register >> AV_BUF_OUTPUT_AUDIO_VIDEO_SELECT to select the output for audio or video. >> And in the future, many drm properties (like video_tpg, audio_tpg, >> audio_pl, etc) also need to access it. So let's introduce some variables >> of enum type and consolidate the code to unify handling this. >> >> Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> >> --- >> drivers/gpu/drm/xlnx/zynqmp_disp.c | 166 ++++++++++++++---------- >> drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 15 +-- >> 2 files changed, 101 insertions(+), 80 deletions(-) >> >> diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c >> b/drivers/gpu/drm/xlnx/zynqmp_disp.c >> index c55e24412f8c..a82bc88a98aa 100644 >> --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c >> +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c >> @@ -102,12 +102,39 @@ enum zynqmp_disp_layer_id { >> >> /** >> * enum zynqmp_disp_layer_mode - Layer mode >> - * @ZYNQMP_DISP_LAYER_NONLIVE: non-live (memory) mode >> + * @ZYNQMP_DISP_LAYER_MEM: memory mode >> * @ZYNQMP_DISP_LAYER_LIVE: live (stream) mode >> + * @ZYNQMP_DISP_LAYER_TPG: tpg mode (only for video layer) >> + * @ZYNQMP_DISP_LAYER_DISABLE: disable mode >> */ >> enum zynqmp_disp_layer_mode { >> - ZYNQMP_DISP_LAYER_NONLIVE, >> - ZYNQMP_DISP_LAYER_LIVE >> + ZYNQMP_DISP_LAYER_MEM, >> + ZYNQMP_DISP_LAYER_LIVE, >> + ZYNQMP_DISP_LAYER_TPG, >> + ZYNQMP_DISP_LAYER_DISABLE >> +}; >> + >> +enum avbuf_vid_mode { >> + VID_MODE_LIVE, >> + VID_MODE_MEM, >> + VID_MODE_TPG, >> + VID_MODE_NONE >> +}; >> + >> +enum avbuf_gfx_mode { >> + GFX_MODE_DISABLE, >> + GFX_MODE_MEM, >> + GFX_MODE_LIVE, >> + GFX_MODE_NONE >> +}; >> + >> +enum avbuf_aud_mode { >> + AUD1_MODE_LIVE, >> + AUD1_MODE_MEM, >> + AUD1_MODE_TPG, >> + AUD1_MODE_DISABLE, >> + AUD2_MODE_DISABLE, >> + AUD2_MODE_ENABLE >> }; >> >> /** >> @@ -542,92 +569,98 @@ static void >> zynqmp_disp_avbuf_disable_channels(struct zynqmp_disp_avbuf *avbuf) >> } >> >> /** >> - * zynqmp_disp_avbuf_enable_audio - Enable audio >> + * zynqmp_disp_avbuf_output_select - Select the buffer manager outputs >> * @avbuf: Audio/video buffer manager >> + * @layer: The layer >> + * @mode: The mode for this layer >> * >> - * Enable all audio buffers with a non-live (memory) source. >> + * Select the buffer manager outputs for @layer. >> */ >> -static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf >> *avbuf) >> +static void zynqmp_disp_avbuf_output_select(struct zynqmp_disp_avbuf >> *avbuf, >> + struct zynqmp_disp_layer *layer, u32 mode) > > You can put 'mode' on a new line to avoid getting over 80 characters. > >> { >> - u32 val; >> - >> - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; >> - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); >> + u32 reg; >> + >> + reg = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); > > Empty line here (spacing before comment) > >> + /* Select audio mode when the layer is NULL */ >> + if (layer == NULL) { >> + if (mode >= AUD2_MODE_DISABLE) { >> + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK; >> + reg |= (mode - AUD2_MODE_DISABLE) >> + << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT; > > Please consider using the FIELD_PREP() macro from <linux/bitfield.h>. > Then you can get rid of your *_SHIFT macros. > >> + } else { >> + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; >> + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT; >> + } >> + } else if (is_layer_vid(layer)) { >> + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; >> + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT; >> + } else { >> + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; >> + reg |= mode << ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT; >> + } > > Empty line here (spacing after block) > >> + zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); >> } >> >> /** >> - * zynqmp_disp_avbuf_disable_audio - Disable audio >> + * zynqmp_disp_avbuf_enable_audio - Enable audio >> * @avbuf: Audio/video buffer manager >> * >> - * Disable all audio buffers. >> + * Enable all audio buffers. >> */ >> -static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf >> *avbuf) >> +static void zynqmp_disp_avbuf_enable_audio(struct zynqmp_disp_avbuf >> *avbuf) >> { >> - u32 val; >> - >> - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE; > > Same as above with FIELD_PREP(). > >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; >> - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); >> + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_MEM); >> + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_ENABLE); >> } >> >> /** >> - * zynqmp_disp_avbuf_enable_video - Enable a video layer >> + * zynqmp_disp_avbuf_disable_audio - Disable audio >> * @avbuf: Audio/video buffer manager >> - * @layer: The layer >> - * @mode: Operating mode of layer >> * >> - * Enable the video/graphics buffer for @layer. >> + * Disable all audio buffers. >> */ >> -static void zynqmp_disp_avbuf_enable_video(struct zynqmp_disp_avbuf >> *avbuf, >> - struct zynqmp_disp_layer *layer, >> - enum zynqmp_disp_layer_mode mode) >> +static void zynqmp_disp_avbuf_disable_audio(struct zynqmp_disp_avbuf >> *avbuf) >> { >> - u32 val; >> - >> - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - if (is_layer_vid(layer)) { >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; >> - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; >> - else >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE; >> - } else { >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; >> - if (mode == ZYNQMP_DISP_LAYER_NONLIVE) >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; >> - else >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE; >> - } >> - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); >> + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD1_MODE_DISABLE); >> + zynqmp_disp_avbuf_output_select(avbuf, NULL, AUD2_MODE_DISABLE); >> } >> >> /** >> - * zynqmp_disp_avbuf_disable_video - Disable a video layer >> - * @avbuf: Audio/video buffer manager >> + * zynqmp_disp_avbuf_set_layer_output -Set layer output > > You're missing a space after the dash character. > >> * @layer: The layer >> + * @mode: The layer mode >> * >> - * Disable the video/graphics buffer for @layer. >> + * Set output for @layer >> */ >> -static void zynqmp_disp_avbuf_disable_video(struct zynqmp_disp_avbuf >> *avbuf, >> - struct zynqmp_disp_layer *layer) >> +static void zynqmp_disp_avbuf_set_layer_output(struct >> zynqmp_disp_layer *layer, >> + enum zynqmp_disp_layer_mode mode) >> { >> - u32 val; >> - >> - val = zynqmp_disp_avbuf_read(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT); >> - if (is_layer_vid(layer)) { >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; >> - } else { >> - val &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; >> - val |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE; >> + int val; >> + struct zynqmp_disp *disp = layer->disp; > > I'd swap these two lines above - variables are usually defined in > "reverse christmas tree" order, the longest line first, the smallest > line last. No big deal though. > >> + >> + switch (mode) { >> + case ZYNQMP_DISP_LAYER_LIVE: >> + val = is_layer_vid(layer) ? VID_MODE_LIVE : GFX_MODE_LIVE; >> + break; >> + case ZYNQMP_DISP_LAYER_MEM: >> + val = is_layer_vid(layer) ? VID_MODE_MEM : GFX_MODE_MEM; >> + break; >> + case ZYNQMP_DISP_LAYER_TPG: >> + if (!is_layer_vid(layer)) { >> + dev_err(disp->dev, "gfx layer has no tpg mode\n"); >> + return; >> + } >> + val = VID_MODE_TPG; >> + break; >> + case ZYNQMP_DISP_LAYER_DISABLE: >> + val = is_layer_vid(layer) ? VID_MODE_NONE : GFX_MODE_DISABLE; >> + break; >> + default: >> + dev_err(disp->dev, "invalid layer mode\n"); >> + return; >> } >> - zynqmp_disp_avbuf_write(avbuf, ZYNQMP_DISP_AV_BUF_OUTPUT, val); > > While you're at it, you can add an empty line here (spacing after block) > >> + zynqmp_disp_avbuf_output_select(&disp->avbuf, layer, val); >> } >> >> /** >> @@ -1030,11 +1063,10 @@ zynqmp_disp_layer_find_format(struct >> zynqmp_disp_layer *layer, >> */ >> static void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer) >> { >> - zynqmp_disp_avbuf_enable_video(&layer->disp->avbuf, layer, >> - ZYNQMP_DISP_LAYER_NONLIVE); >> + zynqmp_disp_avbuf_set_layer_output(layer, ZYNQMP_DISP_LAYER_MEM); >> zynqmp_disp_blend_layer_enable(&layer->disp->blend, layer); >> >> - layer->mode = ZYNQMP_DISP_LAYER_NONLIVE; >> + layer->mode = ZYNQMP_DISP_LAYER_MEM; >> } >> >> /** >> @@ -1051,7 +1083,7 @@ static void zynqmp_disp_layer_disable(struct >> zynqmp_disp_layer *layer) >> for (i = 0; i < layer->drm_fmt->num_planes; i++) >> dmaengine_terminate_sync(layer->dmas[i].chan); >> >> - zynqmp_disp_avbuf_disable_video(&layer->disp->avbuf, layer); >> + zynqmp_disp_avbuf_set_layer_output(layer, >> ZYNQMP_DISP_LAYER_DISABLE); >> zynqmp_disp_blend_layer_disable(&layer->disp->blend, layer); >> } >> >> diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h >> b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h >> index f92a006d5070..dad3e356d9ab 100644 >> --- a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h >> +++ b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h >> @@ -120,23 +120,12 @@ >> #define ZYNQMP_DISP_AV_BUF_OUTPUT 0x70 >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT 0 >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK (0x3 << 0) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE (0 << 0) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM (1 << 0) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN (2 << 0) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE (3 << 0) >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT 2 >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK (0x3 << 2) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE (0 << 2) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM (1 << 2) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE (2 << 2) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_NONE (3 << 2) >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT 4 >> #define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK (0x3 << 4) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PL (0 << 4) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM (1 << 4) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PATTERN (2 << 4) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE (3 << 4) >> -#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN BIT(6) >> +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_MASK (0x1 << 6) >> +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_SHIFT 6 > > Please use BIT() or GENMASK(). You don't need the _SHIFT macros if you > use FIELD_PREP() / FIELD_GET(). > > Cheers, > -Paul > >> #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT0 0x74 >> #define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT1 0x78 >> #define ZYNQMP_DISP_AV_BUF_PATTERN_GEN_SELECT 0x100 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-18 5:30 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-13 11:45 [PATCH 0/2] drm: xlnx: add some functions quanyang.wang 2021-05-13 11:45 ` [PATCH 1/2] drm: xlnx: add is_layer_vid() to simplify the code quanyang.wang 2021-05-17 16:48 ` Paul Cercueil 2021-05-18 5:14 ` quanyang.wang 2021-05-13 11:45 ` [PATCH 2/2] drm: xlnx: consolidate the functions which programming AUDIO_VIDEO_SELECT register quanyang.wang 2021-05-17 17:09 ` Paul Cercueil 2021-05-18 5:22 ` quanyang.wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).