| Message ID | 20250203145824.155869-4-herve.codina@bootlin.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for errors recovery in the TI SN65DSI83 bridge driver | expand |
On Mon, Feb 03, 2025 at 03:58:22PM +0100, Herve Codina wrote: > The current code uses a the reset_pipe() local function to reset the > CRTC outputs. > > drm_atomic_helper_reset_crtc() has been introduced recently and it > performs exact same operations. > > In order to avoid code duplication, use the new helper instead of the > local function. > > Signed-off-by: Herve Codina <herve.codina@bootlin.com> > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 30 +----------------------------- > 1 file changed, 1 insertion(+), 29 deletions(-) > Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Hi Dmitry, On Mon, 3 Feb 2025 17:56:46 +0200 Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > On Mon, Feb 03, 2025 at 03:58:22PM +0100, Herve Codina wrote: > > The current code uses a the reset_pipe() local function to reset the > > CRTC outputs. > > > > drm_atomic_helper_reset_crtc() has been introduced recently and it > > performs exact same operations. > > > > In order to avoid code duplication, use the new helper instead of the > > local function. > > > > Signed-off-by: Herve Codina <herve.codina@bootlin.com> > > --- > > drivers/gpu/drm/vc4/vc4_hdmi.c | 30 +----------------------------- > > 1 file changed, 1 insertion(+), 29 deletions(-) > > > > Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > I messed me up in this v4. It doesn't apply on top of v6.14-rc1. I already sent a v5 to fix that. Can you add your tag on the v5? Of course, I will add them myself if a v6 is needed. I am sorry about my mistake. Apologies, Hervé
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 47d9ada98430..e878eddc9c3f 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -270,34 +270,6 @@ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {} #endif -static int reset_pipe(struct drm_crtc *crtc, - struct drm_modeset_acquire_ctx *ctx) -{ - struct drm_atomic_state *state; - struct drm_crtc_state *crtc_state; - int ret; - - state = drm_atomic_state_alloc(crtc->dev); - if (!state) - return -ENOMEM; - - state->acquire_ctx = ctx; - - crtc_state = drm_atomic_get_crtc_state(state, crtc); - if (IS_ERR(crtc_state)) { - ret = PTR_ERR(crtc_state); - goto out; - } - - crtc_state->connectors_changed = true; - - ret = drm_atomic_commit(state); -out: - drm_atomic_state_put(state); - - return ret; -} - static int vc4_hdmi_reset_link(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx) { @@ -376,7 +348,7 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector, * would be perfectly happy if were to just reconfigure * the SCDC settings on the fly. */ - return reset_pipe(crtc, ctx); + return drm_atomic_helper_reset_crtc(crtc, ctx); } static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi,
The current code uses a the reset_pipe() local function to reset the CRTC outputs. drm_atomic_helper_reset_crtc() has been introduced recently and it performs exact same operations. In order to avoid code duplication, use the new helper instead of the local function. Signed-off-by: Herve Codina <herve.codina@bootlin.com> --- drivers/gpu/drm/vc4/vc4_hdmi.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)