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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 719F4C3F2CD for ; Fri, 28 Feb 2020 00:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 345372469F for ; Fri, 28 Feb 2020 00:21:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PVVcUtLn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730233AbgB1AVR (ORCPT ); Thu, 27 Feb 2020 19:21:17 -0500 Received: from ozlabs.org ([203.11.71.1]:44989 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730028AbgB1AVR (ORCPT ); Thu, 27 Feb 2020 19:21:17 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 48T9F16RlXz9sRR; Fri, 28 Feb 2020 11:21:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1582849274; bh=bqdlhaCdEDQDT6fMYuS3yfXwDRqxYLhmkBEqspxX+SA=; h=Date:From:To:Cc:Subject:From; b=PVVcUtLncUnQHw/RSYelG+mm5ydul2tL/gOubl5BsQOKfaJMlVQdOHTx0aos5eO5d HXphgeaI3XHAbCJvyuzAxRK0PDoij9NE3DnOUTNrVlfhZB4kHJ8IRoyX4viFyDlDOz R6xrJg2DqL0dkzUL1htwpy9tdbtMP+rEyiokKEpLqiE6RE+ykHyS/oSExseE5QdrUK h86heK9ArpX6KbYq1s0PuCvJ59s+ozbhW8k14ueSFRS5RqSBTvRQVX/eW1YXE325eR x/dRGbMprADGFbTU+dRFPQW582Nn06rU5SHydvTZjolbbr4NxvqhklV9OkbJGG16TC x8SnX+qnbKhcA== Date: Fri, 28 Feb 2020 11:21:04 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Zimmermann Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20200228112104.519f002a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/AVQw4vs8Tk23cwQ7zQ.TRLY"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/AVQw4vs8Tk23cwQ7zQ.TRLY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c between commits: ea702333e567 ("drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_sc= anout_position()") e3eff4b5d91e ("drm/amdgpu: Convert to CRTC VBLANK callbacks") from the drm tree and commit: c6385e503aea ("drm/amdgpu: drop legacy drm load and unload callbacks") from the amdgpu tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 4598836c5fa4,4e868229e3b7..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@@ -1377,17 -1434,30 +1434,15 @@@ int amdgpu_file_to_fpriv(struct file *f return 0; } =20 -static bool -amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pip= e, - bool in_vblank_irq, int *vpos, int *hpos, - ktime_t *stime, ktime_t *etime, - const struct drm_display_mode *mode) -{ - return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, - stime, etime, mode); -} - static struct drm_driver kms_driver =3D { .driver_features =3D - DRIVER_USE_AGP | DRIVER_ATOMIC | + DRIVER_ATOMIC | DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE, .open =3D amdgpu_driver_open_kms, .postclose =3D amdgpu_driver_postclose_kms, .lastclose =3D amdgpu_driver_lastclose_kms, - .unload =3D amdgpu_driver_unload_kms, - .get_vblank_counter =3D amdgpu_get_vblank_counter_kms, - .enable_vblank =3D amdgpu_enable_vblank_kms, - .disable_vblank =3D amdgpu_disable_vblank_kms, - .get_vblank_timestamp =3D drm_calc_vbltimestamp_from_scanoutpos, - .get_scanout_position =3D amdgpu_get_crtc_scanout_position, .irq_handler =3D amdgpu_irq_handler, .ioctls =3D amdgpu_ioctls_kms, .gem_free_object_unlocked =3D amdgpu_gem_object_free, --Sig_/AVQw4vs8Tk23cwQ7zQ.TRLY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5YXPAACgkQAVBC80lX 0GzenAf/Wd+u9XikAJGbQ9oKu7F78Ud8B02dUODEjH+XLQi4E6Ng3RqFVWjhJr82 a3PevgG/R6G0SfkWMK2flCtxQ7zFRbzmBrhrP19PVi/uv7YuJ0KzFkQY4UOnQL+O rBwsCjqzALfNS4cI5yYoALHfB43/oscyHB6aGLZyaGo1V8m5kIYr7k0ihq92XLcv HV10qLd4W73ww0kzqc+LMSQhSieRTcQ3ZlshsryU/I92UO9ca95itgfZyCpXlefk CtnkHl/XBhQtQKXHAmuXXH8OhPLLQZ3AfAfw1h6y2lztEPvkWWqBmkQrS8xlPt/b GeozJOzvKNaqk7hXGDMBrRddlgG1zg== =/PX2 -----END PGP SIGNATURE----- --Sig_/AVQw4vs8Tk23cwQ7zQ.TRLY--