2021-11-18 19:30:18

by Hsin-Yi Wang

[permalink] [raw]
Subject: [PATCH v2] drm/bridge: anx7625: Fix edid_read break case in sp_tx_edid_read()

edid_read() was assumed to return 0 on success. After
7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()"),
the function will return > 0 for successful case, representing the i2c
read bytes. Otherwise -EIO on failure cases. Update the g_edid_break
break condition accordingly.

Fixes: 7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()")
Signed-off-by: Hsin-Yi Wang <[email protected]>
Reviewed-by: Robert Foss <[email protected]>
---
v2: Fix type error.
---
drivers/gpu/drm/bridge/analogix/anx7625.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 1a871f6b6822ee..3a18f1dabcfd51 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -795,7 +795,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
int count, blocks_num;
u8 pblock_buf[MAX_DPCD_BUFFER_SIZE];
u8 i, j;
- u8 g_edid_break = 0;
+ int g_edid_break = 0;
int ret;
struct device *dev = &ctx->client->dev;

@@ -826,7 +826,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
g_edid_break = edid_read(ctx, offset,
pblock_buf);

- if (g_edid_break)
+ if (g_edid_break < 0)
break;

memcpy(&pedid_blocks_buf[offset],
--
2.34.0.rc2.393.gf8c9666880-goog



2021-11-19 01:55:05

by Xin Ji

[permalink] [raw]
Subject: Re: [PATCH v2] drm/bridge: anx7625: Fix edid_read break case in sp_tx_edid_read()

On Fri, Nov 19, 2021 at 03:30:02AM +0800, Hsin-Yi Wang wrote:
> edid_read() was assumed to return 0 on success. After
> 7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()"),
> the function will return > 0 for successful case, representing the i2c
> read bytes. Otherwise -EIO on failure cases. Update the g_edid_break
> break condition accordingly.
Hi Hsin-Yi, thanks for the patch!
Reviewed-by: Xin Ji <[email protected]>
>
> Fixes: 7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()")
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> Reviewed-by: Robert Foss <[email protected]>
> ---
> v2: Fix type error.
> ---
> drivers/gpu/drm/bridge/analogix/anx7625.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> index 1a871f6b6822ee..3a18f1dabcfd51 100644
> --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> @@ -795,7 +795,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> int count, blocks_num;
> u8 pblock_buf[MAX_DPCD_BUFFER_SIZE];
> u8 i, j;
> - u8 g_edid_break = 0;
> + int g_edid_break = 0;
> int ret;
> struct device *dev = &ctx->client->dev;
>
> @@ -826,7 +826,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> g_edid_break = edid_read(ctx, offset,
> pblock_buf);
>
> - if (g_edid_break)
> + if (g_edid_break < 0)
> break;
>
> memcpy(&pedid_blocks_buf[offset],
> --
> 2.34.0.rc2.393.gf8c9666880-goog

2021-11-24 14:18:21

by Robert Foss

[permalink] [raw]
Subject: Re: [PATCH v2] drm/bridge: anx7625: Fix edid_read break case in sp_tx_edid_read()

On Fri, 19 Nov 2021 at 02:55, Xin Ji <[email protected]> wrote:
>
> On Fri, Nov 19, 2021 at 03:30:02AM +0800, Hsin-Yi Wang wrote:
> > edid_read() was assumed to return 0 on success. After
> > 7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()"),
> > the function will return > 0 for successful case, representing the i2c
> > read bytes. Otherwise -EIO on failure cases. Update the g_edid_break
> > break condition accordingly.
> Hi Hsin-Yi, thanks for the patch!
> Reviewed-by: Xin Ji <[email protected]>
> >
> > Fixes: 7f16d0f3b8e2("drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()")
> > Signed-off-by: Hsin-Yi Wang <[email protected]>
> > Reviewed-by: Robert Foss <[email protected]>
> > ---
> > v2: Fix type error.
> > ---
> > drivers/gpu/drm/bridge/analogix/anx7625.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
> > index 1a871f6b6822ee..3a18f1dabcfd51 100644
> > --- a/drivers/gpu/drm/bridge/analogix/anx7625.c
> > +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
> > @@ -795,7 +795,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> > int count, blocks_num;
> > u8 pblock_buf[MAX_DPCD_BUFFER_SIZE];
> > u8 i, j;
> > - u8 g_edid_break = 0;
> > + int g_edid_break = 0;
> > int ret;
> > struct device *dev = &ctx->client->dev;
> >
> > @@ -826,7 +826,7 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,
> > g_edid_break = edid_read(ctx, offset,
> > pblock_buf);
> >
> > - if (g_edid_break)
> > + if (g_edid_break < 0)
> > break;
> >
> > memcpy(&pedid_blocks_buf[offset],
> > --

Fixed commit id syntax of commit message in order to make checkpatch
--strict happy.

Applied to drm-misc-next.