Re: linux-next: build failure after merge of the drm tree

[Stephen Rothwell]

Hi Alex,

On Thu, 6 Oct 2022 09:56:32 -0400 Alex Deucher <alexdeucher@xxxxxxxxx> wrote:
>
> This looks good to me.  Care to add you s-o-b?
> 
> On Thu, Oct 6, 2022 at 4:12 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > This works as well, and (in my opinion) is better:
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
> > index ae13887756bf..fb6222d4c430 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
> > @@ -499,7 +499,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
> >                 struct dc_stream_state *stream,
> >                 uint32_t dwb_pipe_inst)
> >  {
> > -       int i = 0, j = 0;
> > +       unsigned int i, j;
> >         if (stream == NULL) {
> >                 dm_error("DC: dc_stream is NULL!\n");
> >                 return false;
> > @@ -520,9 +520,9 @@ bool dc_stream_remove_writeback(struct dc *dc,
> >         }
> >
> >         /* remove writeback info for disabled writeback pipes from stream */
> > -       for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
> > +       for (i = 0, j = 0; i < stream->num_wb_info; i++) {
> >                 if (stream->writeback_info[i].wb_enabled) {
> > -                       if (i != j)
> > +                       if (j < i)
> >                                 /* trim the array */
> >                                 stream->writeback_info[j] = stream->writeback_info[i];
> >                         j++;

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

-- 
Cheers,
Stephen Rothwell

Attachment: pgpnjUgwOWrYZ.pgp
Description: OpenPGP digital signature