Subject: linux-next: manual merge of the drm-misc tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Oct 2019 10:38:30 +1100

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)
  {
  	/*