[PATCH] drm/qxl: Fix build errors

[Sean Paul]

On Mon, Aug 17, 2020 at 4:09 PM Sean Paul <sean at poorly.run> wrote:
>
> On Mon, Aug 17, 2020 at 4:05 PM Sam Ravnborg <sam at ravnborg.org> wrote:
> >
> > Hi Sean.
> >
> > On Mon, Aug 17, 2020 at 03:58:38PM -0400, Sean Paul wrote:
> > > From: Sean Paul <seanpaul at chromium.org>
> > >
> > > Introduced in the patch below, the END macro was missing 'dev' and BEGIN
> > > macro needs drm_drv_uses_atomic_modeset() from drm_drv.h
> > >
> > > Fixes: bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
> > We should not use Fixes for local fixes like this, as we do not want the
> > robots to pick this commit.
> > With the Fixes: dropped (maybe just reference the commit in the
> > changelog):
> > Acked-by: Sam Ravnborg <sam at ravnborg.org>
> >
>
> Ok, I'll fix up the Fixes: tag and apply to -misc-next.
>

I guess things are never quite so easy :-). It looks like Daniel's
patch is in drm-misc-fixes and Sidong's patch is in drm-misc-next. On
their own they're fine, but once they are merged in drm-tip the build
error shows up.

So I think this needs to be resolved in drm-tip. I see
https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#fixing-silent-conflicts,
but that seems like a maintainer thing, so I'll wait for -misc
maintainers to chime in.

Sean

> Thanks for the quick response!
>
> Sean
>
> >
> > > Cc: Sidong Yang <realwakka at gmail.com>
> > > Cc: Gerd Hoffmann <kraxel at redhat.com>
> > > Cc: Dave Airlie <airlied at redhat.com>
> > > Cc: virtualization at lists.linux-foundation.org
> > > Signed-off-by: Sean Paul <seanpaul at chromium.org>
> > > ---
> > >  drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
> > > index fa79688013b7..5b4fd6952b53 100644
> > > --- a/drivers/gpu/drm/qxl/qxl_display.c
> > > +++ b/drivers/gpu/drm/qxl/qxl_display.c
> > > @@ -28,6 +28,7 @@
> > >
> > >  #include <drm/drm_atomic.h>
> > >  #include <drm/drm_atomic_helper.h>
> > > +#include <drm/drm_drv.h>
> > >  #include <drm/drm_gem_framebuffer_helper.h>
> > >  #include <drm/drm_plane_helper.h>
> > >  #include <drm/drm_probe_helper.h>
> > > @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)
> > >
> > >       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> > >       qxl_update_offset_props(qdev);
> > > -     DRM_MODESET_LOCK_ALL_END(ctx, ret);
> > > +     DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> > >       if (!drm_helper_hpd_irq_event(dev)) {
> > >               /* notify that the monitor configuration changed, to
> > >                  adjust at the arbitrary resolution */
> > > @@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,
> > >                         clips, num_clips, inc, 0);
> > >
> > >  out_lock_end:
> > > -     DRM_MODESET_LOCK_ALL_END(ctx, ret);
> > > +     DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);
> > >
> > >       return 0;
> > >  }
> > > --
> > > Sean Paul, Software Engineer, Google / Chromium OS
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel