[intel-gvt-linux:gvt-staging 1991/2009] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4832:10: warning: assignment makes integer from pointer without a cast

Mario Kleiner mario.kleiner.de at gmail.com
Mon Mar 4 22:29:08 UTC 2019


On Mon, Mar 4, 2019 at 11:16 PM David Airlie <airlied at redhat.com> wrote:
>
> On Tue, Mar 5, 2019 at 8:11 AM David Airlie <airlied at redhat.com> wrote:
> >
> > On Tue, Mar 5, 2019 at 8:05 AM Mario Kleiner <mario.kleiner.de at gmail.com> wrote:
> > >
> > > Ok,
> > >
> > > sorry for the late replies. My mail client somehow didn't show me all
> > > the conversations around this patch over the weekend :-/.
> > >
> > > I had a look at the various trees wrt. to the patch "drm/amd/display:
> > > Use vrr friendly pageflip throttling in DC."
> > >
> > > We apparently have 3 different versions of the patch, modified for
> > > three different ways that amdgpu DC looks depending on 5.0/5.1/5.2 as
> > > there has been a lot of refactoring, and then some mixups in which
> > > patch needs to end up in which branch :-/
> > >
> > > The patch in Linux 5.0.0 and current drm-fixes is correct, so the
> > > released kernel is fine.
> > >
> > > The patch in current drm-next (presumably pulled from
> > > agd5f/drm-next-5.2-wip) and current agd5f/drm-next-5.2-wip and
> > > drm-next-5.1-wip and drm-next-5.1 is *wrong*. Strangely it doesn't
> > > correspond to the patch i sent out to the mailing list, and that was
> > > reviewed-by and tested by Nicholas, which was correct.
> >
> > Probably my fault, Alex said the patch in his drm-next-5.2-wip was the
> > one, I pulled it but didn't go back and check for any mailing list
> > discussion.
> >
> > I'll make this change in drm-next, I'm trying to decide if it's worth
> > force pushing it.
> >
> Okay I've force pushed drm-next with the change you asked for,
>
> Please confirm it.
>

Yes, the force pushed patch in drm-next is now correct.

But the buggy patch is also present in Alex drm-next-5.1/5.2[-wip]
branches, so i guess Alex needs to somehow pull this back into his
tree, or fix it up for the 5.1 release, maybe also force push for 5.1.

The stuff in agd5f/amd-staging-drm-next branch is correct for the
current state of that branch. I expect that stuff and everything
relating to Linux 5.2 will be superseded by the patch i'm working on
atm. before the 5.2 merge window.

-mario


More information about the intel-gvt-dev mailing list