From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2CD3C433E1 for ; Mon, 17 Aug 2020 20:45:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C3722065D for ; Mon, 17 Aug 2020 20:45:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="UPnF6F98" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C3722065D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0606F89E14; Mon, 17 Aug 2020 20:45:53 +0000 (UTC) Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id F271C89E11 for ; Mon, 17 Aug 2020 20:45:51 +0000 (UTC) Received: by mail-il1-x144.google.com with SMTP id k4so15726686ilr.12 for ; Mon, 17 Aug 2020 13:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=aubl/YTAJ301fsjcEvbHVCoJLOaH9okD1ZB+NzuxKfc=; b=UPnF6F989f39X5QO1QEMnlbupsRNTnGhluKWRNhVS9kLoJf5Jl4D+m6Hxyw5DXVWJk qOHis0jcQ7Mig00qClMEULU+ZEMouk6XKeYYeXReexT1749o/CVCr2BA1aaNNOHuVAzO A8z6silHlfK9cuXAhNSXsycDv9vhuNpHQwZyeznuvhIporFcG83HPm0C4O5bXFggmXxa BklBVeerGbEEwW/6E3xyxExjzN0XTTRfb2Lmt/cJYWU0crZxa08MDZ8LiE4GCf1Kwbuy ElwFNv1i7eGFy3+mWjvQ74v0h+X65qeV+qS7X4LQE7jqN3U62pzsvPY1swgu9Cvq2U2M 1rGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=aubl/YTAJ301fsjcEvbHVCoJLOaH9okD1ZB+NzuxKfc=; b=iSpcGYSn2d1GHPLms/utBRdVi1Pnf/gI43u+nLZOF7Vb3EZDnKnUAQKYYxcBHwtvkm BY6HyYF14YScyKKm+PbXTFyXaQw63n8P0IAWtPdYu0Xwska0XIlGwAkbx6dHdSj10Cjo rJlxWzvo1CvytotY4KZpzDoP5lvSgez9hPWUKhBoxVPy/RRDy5B986Od0j4aP/oqTdnU Peg33uRt+uiJKG1m6POhX/X7fqyoSIZhWcNfHLEP3E/1dtiXHUtFeIxFHVFoRG3SykvG 723yE/oJ6x+6mhX31irX2UDRGOyURdONwYcVMG9DaBIzlX6+fXO4Vml1gK0Y1IhJGq+d BKBQ== X-Gm-Message-State: AOAM532Z2zF6E9ViAn08oJhXM+0MhGN8mQIcPWEEVFyPY+NYAD0RTijn 3qWkItUyeurmPLRlYM57RKSXhdrBTQixYTViuoP9+w== X-Google-Smtp-Source: ABdhPJw0n7aagCbCACyHnfXi52mmA71tok6ndm1PaGHxmNzM/bV2r5BE9PNOhs8OdqbE0HDwnZRHAfZQ5yuxtymtaNM= X-Received: by 2002:a05:6e02:1107:: with SMTP id u7mr15482392ilk.165.1597697151345; Mon, 17 Aug 2020 13:45:51 -0700 (PDT) MIME-Version: 1.0 References: <20200817195846.14076-1-sean@poorly.run> <20200817200521.GA1551172@ravnborg.org> In-Reply-To: From: Sean Paul Date: Mon, 17 Aug 2020 16:45:14 -0400 Message-ID: Subject: Re: [PATCH] drm/qxl: Fix build errors To: Sam Ravnborg X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , dri-devel , virtualization@lists.linux-foundation.org, Sean Paul , Gerd Hoffmann , Dave Airlie , spice-devel@lists.freedesktop.org, Sidong Yang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Aug 17, 2020 at 4:09 PM Sean Paul wrote: > > On Mon, Aug 17, 2020 at 4:05 PM Sam Ravnborg wrote: > > > > Hi Sean. > > > > On Mon, Aug 17, 2020 at 03:58:38PM -0400, Sean Paul wrote: > > > From: Sean Paul > > > > > > 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 > > > > 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 > > > Cc: Gerd Hoffmann > > > Cc: Dave Airlie > > > Cc: virtualization@lists.linux-foundation.org > > > Signed-off-by: Sean Paul > > > --- > > > 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 > > > #include > > > +#include > > > #include > > > #include > > > #include > > > @@ -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@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel