From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Gerd Hoffmann <kraxel@redhat.com>, Jani Nikula <jani.nikula@intel.com> Subject: linux-next: manual merge of the drm-misc tree with the drm tree Date: Wed, 9 Oct 2019 10:38:30 +1100 [thread overview] Message-ID: <20191009103830.0b75dbb5@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1970 bytes --] Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_drv.c between commit: 2d6f6f359fd8 ("drm/i915: add i915_driver_modeset_remove()") from the drm tree and commit: f2521f7731ed ("drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers") from the drm-misc 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.c index 15abad5c2d62,1c4ff8b5b0a2..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@@ -350,44 -422,6 +350,19 @@@ out return ret; } - static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) - { - struct apertures_struct *ap; - struct pci_dev *pdev = dev_priv->drm.pdev; - struct i915_ggtt *ggtt = &dev_priv->ggtt; - bool primary; - int ret; - - ap = alloc_apertures(1); - if (!ap) - return -ENOMEM; - - ap->ranges[0].base = ggtt->gmadr.start; - ap->ranges[0].size = ggtt->mappable_end; - - primary = - pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; - - ret = drm_fb_helper_remove_conflicting_framebuffers(ap, "inteldrmfb", primary); - - kfree(ap); - - return ret; - } - +static void i915_driver_modeset_remove(struct drm_i915_private *i915) +{ + intel_modeset_driver_remove(i915); + + intel_bios_driver_remove(i915); + + i915_switcheroo_unregister(i915); + + intel_vga_unregister(i915); + + intel_csr_ucode_fini(i915); +} + static void intel_init_dpio(struct drm_i915_private *dev_priv) { /* [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Jani Nikula <jani.nikula@intel.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Gerd Hoffmann <kraxel@redhat.com> Subject: linux-next: manual merge of the drm-misc tree with the drm tree Date: Wed, 9 Oct 2019 10:38:30 +1100 [thread overview] Message-ID: <20191009103830.0b75dbb5@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1970 bytes --] Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_drv.c between commit: 2d6f6f359fd8 ("drm/i915: add i915_driver_modeset_remove()") from the drm tree and commit: f2521f7731ed ("drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers") from the drm-misc 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.c index 15abad5c2d62,1c4ff8b5b0a2..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@@ -350,44 -422,6 +350,19 @@@ out return ret; } - static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) - { - struct apertures_struct *ap; - struct pci_dev *pdev = dev_priv->drm.pdev; - struct i915_ggtt *ggtt = &dev_priv->ggtt; - bool primary; - int ret; - - ap = alloc_apertures(1); - if (!ap) - return -ENOMEM; - - ap->ranges[0].base = ggtt->gmadr.start; - ap->ranges[0].size = ggtt->mappable_end; - - primary = - pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; - - ret = drm_fb_helper_remove_conflicting_framebuffers(ap, "inteldrmfb", primary); - - kfree(ap); - - return ret; - } - +static void i915_driver_modeset_remove(struct drm_i915_private *i915) +{ + intel_modeset_driver_remove(i915); + + intel_bios_driver_remove(i915); + + i915_switcheroo_unregister(i915); + + intel_vga_unregister(i915); + + intel_csr_ucode_fini(i915); +} + static void intel_init_dpio(struct drm_i915_private *dev_priv) { /* [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-10-08 23:38 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-08 23:38 Stephen Rothwell [this message] 2019-10-08 23:38 ` linux-next: manual merge of the drm-misc tree with the drm tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2022-11-09 23:54 Stephen Rothwell 2022-11-09 23:54 ` Stephen Rothwell 2019-10-09 0:12 Stephen Rothwell 2019-10-09 0:10 Stephen Rothwell 2019-10-09 0:10 ` Stephen Rothwell 2019-10-08 23:46 Stephen Rothwell 2019-10-08 23:46 ` Stephen Rothwell 2019-10-08 23:33 Stephen Rothwell 2019-08-19 3:18 Stephen Rothwell 2019-06-11 3:52 Stephen Rothwell 2019-06-11 3:52 ` Stephen Rothwell 2019-06-11 3:38 Stephen Rothwell 2019-06-11 3:38 ` Stephen Rothwell 2019-04-09 1:34 Stephen Rothwell 2019-04-09 1:34 ` Stephen Rothwell 2019-04-09 7:23 ` Gerd Hoffmann 2019-02-08 1:27 Stephen Rothwell 2019-02-08 8:53 ` Daniel Vetter 2019-02-08 8:53 ` Daniel Vetter 2019-02-08 9:25 ` Stephen Rothwell 2019-02-08 9:34 ` Daniel Vetter 2018-11-23 0:13 Stephen Rothwell 2018-11-23 0:13 ` Stephen Rothwell 2018-09-18 1:31 Stephen Rothwell 2018-09-12 0:39 Stephen Rothwell 2018-03-19 1:29 Stephen Rothwell 2018-03-19 1:29 ` Stephen Rothwell 2018-03-19 14:14 ` Ville Syrjälä 2017-11-01 3:36 Stephen Rothwell 2017-04-03 3:18 Stephen Rothwell 2017-04-03 3:18 ` Stephen Rothwell 2016-09-28 2:11 Stephen Rothwell 2014-12-10 1:49 Stephen Rothwell 2014-12-10 1:49 ` Stephen Rothwell 2014-12-03 2:43 Stephen Rothwell 2014-12-03 2:43 ` Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191009103830.0b75dbb5@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.