| Message ID | 20221220094430.3469811-1-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/imx: ipuv3-plane: reuse local variable height in atomic_update | expand |
Am Dienstag, dem 20.12.2022 um 10:44 +0100 schrieb Philipp Zabel: > Use the already existing local variable height = drm_rect_height() >> 16 > to replace other occurrences of the same value. > > Suggested-by: Lucas Stach <l.stach@pengutronix.de> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c > index 80142d9a4a55..dade8b59feae 100644 > --- a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c > +++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c > @@ -618,6 +618,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, > width = ipu_src_rect_width(new_state); > else > width = drm_rect_width(&new_state->src) >> 16; > + height = drm_rect_height(&new_state->src) >> 16; > > eba = drm_plane_state_to_eba(new_state, 0); > > @@ -628,9 +629,9 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, > if (ipu_state->use_pre) { > axi_id = ipu_chan_assign_axi_id(ipu_plane->dma); > ipu_prg_channel_configure(ipu_plane->ipu_ch, axi_id, width, > - drm_rect_height(&new_state->src) >> 16, > - fb->pitches[0], fb->format->format, > - fb->modifier, &eba); > + height, fb->pitches[0], > + fb->format->format, fb->modifier, > + &eba); > } > > if (!old_state->fb || > @@ -684,7 +685,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, > > ipu_dmfc_config_wait4eot(ipu_plane->dmfc, width); > > - height = drm_rect_height(&new_state->src) >> 16; > info = drm_format_info(fb->format->format); > ipu_calculate_bursts(width, info->cpp[0], fb->pitches[0], > &burstsize, &num_bursts); > @@ -747,8 +747,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, > ipu_cpmem_set_burstsize(ipu_plane->ipu_ch, 16); > > ipu_cpmem_zero(ipu_plane->alpha_ch); > - ipu_cpmem_set_resolution(ipu_plane->alpha_ch, width, > - drm_rect_height(&new_state->src) >> 16); > + ipu_cpmem_set_resolution(ipu_plane->alpha_ch, width, height); > ipu_cpmem_set_format_passthrough(ipu_plane->alpha_ch, 8); > ipu_cpmem_set_high_priority(ipu_plane->alpha_ch); > ipu_idmac_set_double_buffer(ipu_plane->alpha_ch, 1); > > base-commit: 4b6cb2b67da883bc5095ee6d77f951f1cd7a1c24
On Di, 2023-01-10 at 19:21 +0100, Lucas Stach wrote: > Am Dienstag, dem 20.12.2022 um 10:44 +0100 schrieb Philipp Zabel: > > Use the already existing local variable height = drm_rect_height() >> 16 > > to replace other occurrences of the same value. > > > > Suggested-by: Lucas Stach <l.stach@pengutronix.de> > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Thank you, pushed to drm-misc-next. regards Philipp
diff --git a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c index 80142d9a4a55..dade8b59feae 100644 --- a/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c @@ -618,6 +618,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, width = ipu_src_rect_width(new_state); else width = drm_rect_width(&new_state->src) >> 16; + height = drm_rect_height(&new_state->src) >> 16; eba = drm_plane_state_to_eba(new_state, 0); @@ -628,9 +629,9 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, if (ipu_state->use_pre) { axi_id = ipu_chan_assign_axi_id(ipu_plane->dma); ipu_prg_channel_configure(ipu_plane->ipu_ch, axi_id, width, - drm_rect_height(&new_state->src) >> 16, - fb->pitches[0], fb->format->format, - fb->modifier, &eba); + height, fb->pitches[0], + fb->format->format, fb->modifier, + &eba); } if (!old_state->fb || @@ -684,7 +685,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, ipu_dmfc_config_wait4eot(ipu_plane->dmfc, width); - height = drm_rect_height(&new_state->src) >> 16; info = drm_format_info(fb->format->format); ipu_calculate_bursts(width, info->cpp[0], fb->pitches[0], &burstsize, &num_bursts); @@ -747,8 +747,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, ipu_cpmem_set_burstsize(ipu_plane->ipu_ch, 16); ipu_cpmem_zero(ipu_plane->alpha_ch); - ipu_cpmem_set_resolution(ipu_plane->alpha_ch, width, - drm_rect_height(&new_state->src) >> 16); + ipu_cpmem_set_resolution(ipu_plane->alpha_ch, width, height); ipu_cpmem_set_format_passthrough(ipu_plane->alpha_ch, 8); ipu_cpmem_set_high_priority(ipu_plane->alpha_ch); ipu_idmac_set_double_buffer(ipu_plane->alpha_ch, 1);
Use the already existing local variable height = drm_rect_height() >> 16 to replace other occurrences of the same value. Suggested-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) base-commit: 4b6cb2b67da883bc5095ee6d77f951f1cd7a1c24