linux-next: manual merge of the drm tree with the asm-generic tree

linux-next: manual merge of the drm tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/gma500/Kconfig

between commit:

  65f5bf96750f ("drm: handle HAS_IOPORT dependencies")

from the asm-generic tree and commit:

  aecdbfe459a0 ("drm/gma500: Run DRM default client setup")

from the drm 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/gma500/Kconfig
index 23b7c14de5e2,c2927c37c40b..000000000000
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_GMA500
  	tristate "Intel GMA500/600/3600/3650 KMS Framebuffer"
 -	depends on DRM && PCI && X86 && MMU
 +	depends on DRM && PCI && X86 && MMU && HAS_IOPORT
+ 	select DRM_CLIENT_SELECTION
  	select DRM_KMS_HELPER
  	select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
  	select I2C

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/qxl/Kconfig

between commit:

  65f5bf96750f ("drm: handle HAS_IOPORT dependencies")

from the asm-generic tree and commit:

  92c13542e878 ("drm/qxl: Run DRM default client setup")

from the drm 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/qxl/Kconfig
index 17d6927e5e23,1992df4a82d2..000000000000
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_QXL
  	tristate "QXL virtual GPU"
 -	depends on DRM && PCI && MMU
 +	depends on DRM && PCI && MMU && HAS_IOPORT
+ 	select DRM_CLIENT_SELECTION
  	select DRM_KMS_HELPER
  	select DRM_TTM
  	select DRM_TTM_HELPER


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm tree with the asm-generic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2149 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/tiny/bochs.c

between commit:

  65f5bf96750f ("drm: handle HAS_IOPORT dependencies")

from the asm-generic tree and commit:

  7934a1c25097 ("drm/bochs: Use video aperture helpers")

from the drm 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/tiny/bochs.c
index e738bb858316,447989bb8201..000000000000
--- a/drivers/gpu/drm/tiny/bochs.c
+++ b/drivers/gpu/drm/tiny/bochs.c
@@@ -1,6 -1,6 +1,7 @@@
  // SPDX-License-Identifier: GPL-2.0-or-later
  
+ #include <linux/aperture.h>
 +#include <linux/bug.h>
  #include <linux/module.h>
  #include <linux/pci.h>
  
@@@ -94,13 -99,13 +100,18 @@@ struct bochs_device 
  	struct drm_connector connector;
  };
  
+ static struct bochs_device *to_bochs_device(const struct drm_device *dev)
+ {
+ 	return container_of(dev, struct bochs_device, dev);
+ }
+ 
  /* ---------------------------------------------------------------------- */
  
 +static __always_inline bool bochs_uses_mmio(struct bochs_device *bochs)
 +{
 +	return !IS_ENABLED(CONFIG_HAS_IOPORT) || bochs->mmio;
 +}
 +
  static void bochs_vga_writeb(struct bochs_device *bochs, u16 ioport, u8 val)
  {
  	if (WARN_ON(ioport < 0x3c0 || ioport > 0x3df))
@@@ -234,10 -236,10 +242,10 @@@ static int bochs_hw_init(struct bochs_d
  			DRM_ERROR("Cannot map mmio region\n");
  			return -ENOMEM;
  		}
 -	} else {
 +	} else if (IS_ENABLED(CONFIG_HAS_IOPORT)) {
  		ioaddr = VBE_DISPI_IOPORT_INDEX;
  		iosize = 2;
- 		if (!request_region(ioaddr, iosize, "bochs-drm")) {
+ 		if (!devm_request_region(&pdev->dev, ioaddr, iosize, "bochs-drm")) {
  			DRM_ERROR("Cannot request ioports\n");
  			return -EBUSY;
  		}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drm tree with the asm-generic tree

[Arnd Bergmann]

On Mon, Oct 28, 2024, at 02:34, Stephen Rothwell wrote:

>  -	} else {
>  +	} else if (IS_ENABLED(CONFIG_HAS_IOPORT)) {
>   		ioaddr = VBE_DISPI_IOPORT_INDEX;
>   		iosize = 2;
> - 		if (!request_region(ioaddr, iosize, "bochs-drm")) {
> + 		if (!devm_request_region(&pdev->dev, ioaddr, iosize, "bochs-drm")) {
>   			DRM_ERROR("Cannot request ioports\n");
>   			return -EBUSY;

Looks good to me, thanks!

      Arnd