Hi Jani,
Le jeudi 14 septembre 2023 à 16:11 +0300, Jani Nikula a écrit :
> The drm stack does not expect error valued pointers for EDID
> anywhere.
>
> Fixes: e66856508746 ("drm: bridge: it66121: Set DDC preamble only
> once before reading EDID")
> Cc: Paul Cercueil <[email protected]>
> Cc: Robert Foss <[email protected]>
> Cc: Phong LE <[email protected]>
> Cc: Neil Armstrong <[email protected]>
> Cc: Andrzej Hajda <[email protected]>
> Cc: Robert Foss <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Jonas Karlman <[email protected]>
> Cc: Jernej Skrabec <[email protected]>
> Cc: <[email protected]> # v6.3+
> Signed-off-by: Jani Nikula <[email protected]>
Applied to drm-misc-next, thanks.
Cheers,
-Paul
>
> ---
>
> UNTESTED
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c
> b/drivers/gpu/drm/bridge/ite-it66121.c
> index 3c9b42c9d2ee..1cf3fb1f13dc 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -884,14 +884,14 @@ static struct edid
> *it66121_bridge_get_edid(struct drm_bridge *bridge,
> mutex_lock(&ctx->lock);
> ret = it66121_preamble_ddc(ctx);
> if (ret) {
> - edid = ERR_PTR(ret);
> + edid = NULL;
> goto out_unlock;
> }
>
> ret = regmap_write(ctx->regmap, IT66121_DDC_HEADER_REG,
> IT66121_DDC_HEADER_EDID);
> if (ret) {
> - edid = ERR_PTR(ret);
> + edid = NULL;
> goto out_unlock;
> }
>
