From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9028F7C for ; Mon, 19 Sep 2022 15:29:10 +0000 (UTC) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 84C7B499; Mon, 19 Sep 2022 17:29:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1663601347; bh=NuzkgiGGksLT/z4/1KJ+JyeCIKwowmxW3Wn0E+L0u/8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l5dwTvrDBt4EtkMgI5YVhD2O473i9JyzN0gFCbTOKHVa7IENvSBo4myUeJY1kjJlC zj+pDA5tURnUMXYWEnVSB9kB58M7BR5UPyII8wR/YisOyQJItwqQJl6Ig+5lhVhQRt sWnkqussNC4kxpIJk+NLjlh2SgWkYqSlFQZjpThg= Date: Mon, 19 Sep 2022 18:28:54 +0300 From: Laurent Pinchart To: Sam Ravnborg Cc: dri-devel@lists.freedesktop.org, Andrzej Hajda , Neil Armstrong , Robert Foss , Jonas Karlman , Jernej Skrabec , Arnd Bergmann , Benson Leung , Cai Huoqing , chrome-platform@lists.linux.dev, Chun-Kuang Hu , Dafna Hirschfeld , Daniel Vetter , David Airlie , Enric Balletbo i Serra , Guenter Roeck , Jitao Shi , Kieran Bingham , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Maarten Lankhorst , Matthias Brugger , Maxime Ripard , Philip Chen , Philipp Zabel , Thomas Zimmermann , Tomi Valkeinen Subject: Re: [PATCH v1 06/12] drm/bridge: cros-ec-anx7688: Use drm_bridge_funcs.atomic_check Message-ID: References: <20220717174454.46616-1-sam@ravnborg.org> <20220717174454.46616-7-sam@ravnborg.org> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220717174454.46616-7-sam@ravnborg.org> Hi Sam, Thank you for the patch. On Sun, Jul 17, 2022 at 07:44:48PM +0200, Sam Ravnborg wrote: > Replace the deprecated drm_bridge_funcs.mode_fixup() with > drm_bridge_funcs.atomic_check(). > > drm_bridge_funcs.atomic_check() requires the atomic state operations, > update these to the default implementations. > > Signed-off-by: Sam Ravnborg > Cc: Andrzej Hajda > Cc: Neil Armstrong > Cc: Robert Foss > Cc: Laurent Pinchart > Cc: Jonas Karlman > Cc: Jernej Skrabec > Cc: Benson Leung > Cc: Guenter Roeck > Cc: chrome-platform@lists.linux.dev Reviewed-by: Laurent Pinchart > --- > drivers/gpu/drm/bridge/cros-ec-anx7688.c | 28 +++++++++++++++--------- > 1 file changed, 18 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c > index 0f6d907432e3..fc19ea87926f 100644 > --- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c > +++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c > @@ -5,6 +5,7 @@ > * Copyright 2020 Google LLC > */ > > +#include > #include > #include > #include > @@ -45,9 +46,10 @@ bridge_to_cros_ec_anx7688(struct drm_bridge *bridge) > return container_of(bridge, struct cros_ec_anx7688, bridge); > } > > -static bool cros_ec_anx7688_bridge_mode_fixup(struct drm_bridge *bridge, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static int cros_ec_anx7688_bridge_atomic_check(struct drm_bridge *bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > { > struct cros_ec_anx7688 *anx = bridge_to_cros_ec_anx7688(bridge); > int totalbw, requiredbw; > @@ -56,13 +58,13 @@ static bool cros_ec_anx7688_bridge_mode_fixup(struct drm_bridge *bridge, > int ret; > > if (!anx->filter) > - return true; > + return 0; > > /* Read both regs 0x85 (bandwidth) and 0x86 (lane count). */ > ret = regmap_bulk_read(anx->regmap, ANX7688_DP_BANDWIDTH_REG, regs, 2); > if (ret < 0) { > DRM_ERROR("Failed to read bandwidth/lane count\n"); > - return false; > + return ret; > } > dpbw = regs[0]; > lanecount = regs[1]; > @@ -71,28 +73,34 @@ static bool cros_ec_anx7688_bridge_mode_fixup(struct drm_bridge *bridge, > if (dpbw > 0x19 || lanecount > 2) { > DRM_ERROR("Invalid bandwidth/lane count (%02x/%d)\n", dpbw, > lanecount); > - return false; > + return -EINVAL; > } > > /* Compute available bandwidth (kHz) */ > totalbw = dpbw * lanecount * 270000 * 8 / 10; > > /* Required bandwidth (8 bpc, kHz) */ > - requiredbw = mode->clock * 8 * 3; > + requiredbw = crtc_state->mode.clock * 8 * 3; > > DRM_DEBUG_KMS("DP bandwidth: %d kHz (%02x/%d); mode requires %d Khz\n", > totalbw, dpbw, lanecount, requiredbw); > > if (totalbw == 0) { > DRM_ERROR("Bandwidth/lane count are 0, not rejecting modes\n"); > - return true; > + return 0; > } > > - return totalbw >= requiredbw; > + if (totalbw < requiredbw) > + return -EINVAL; > + > + return 0; > } > > static const struct drm_bridge_funcs cros_ec_anx7688_bridge_funcs = { > - .mode_fixup = cros_ec_anx7688_bridge_mode_fixup, > + .atomic_check = cros_ec_anx7688_bridge_atomic_check, > + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, > + .atomic_reset = drm_atomic_helper_bridge_reset, > }; > > static int cros_ec_anx7688_bridge_probe(struct i2c_client *client) -- Regards, Laurent Pinchart