linux-next: manual merge of the driver-core tree with the drm tree

linux-next: manual merge of the driver-core tree with the drm tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpu/drm/armada/armada_crtc.c between commit d8c96083cf5e
("drm/armada: permit CRTCs to be registered as separate devices") from
the drm tree and commit c9d53c0f2d23 ("devres: remove
devm_request_and_ioremap()") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/armada/armada_crtc.c
index 3f620e21e06b,3aedf9e993e6..000000000000
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@@ -1064,11 -1039,9 +1064,9 @@@ int armada_drm_crtc_create(struct drm_d
  	if (ret)
  		return ret;
  
- 	base = devm_request_and_ioremap(dev, res);
- 	if (!base) {
- 		DRM_ERROR("failed to ioremap register\n");
- 		return -ENOMEM;
- 	}
 -	base = devm_ioremap_resource(dev->dev, res);
++	base = devm_ioremap_resource(dev, res);
+ 	if (IS_ERR(base))
+ 		return PTR_ERR(base);
  
  	dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
  	if (!dcrtc) {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the driver-core tree with the drm tree

[Greg KH]

On Thu, Jul 24, 2014 at 03:56:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpu/drm/armada/armada_crtc.c between commit d8c96083cf5e
> ("drm/armada: permit CRTCs to be registered as separate devices") from
> the drm tree and commit c9d53c0f2d23 ("devres: remove
> devm_request_and_ioremap()") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the drm tree

[broonie]

Hi all,

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

  drivers/gpu/drm/Kconfig

between commits:

  ba8f16cd08190 ("drm: selftest: convert drm_damage_helper selftest to KUnit")
  fc8d29e298cf4 ("drm: selftest: convert drm_mm selftest to KUnit")

from the drm tree and commit:

  84ec67288c10f ("drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro")

from the driver-core 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.

diff --cc drivers/gpu/drm/Kconfig
index 198ba846d34bf,2438e0dccfa16..0000000000000
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -51,9 -50,22 +51,21 @@@ config DRM_DEBUG_M
  
  	  If in doubt, say "N".
  
+ config DRM_USE_DYNAMIC_DEBUG
+ 	bool "use dynamic debug to implement drm.debug"
+ 	default y
+ 	depends on DRM
+ 	depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE
+ 	depends on JUMP_LABEL
+ 	help
+ 	  Use dynamic-debug to avoid drm_debug_enabled() runtime overheads.
+ 	  Due to callsite counts in DRM drivers (~4k in amdgpu) and 56
+ 	  bytes per callsite, the .data costs can be substantial, and
+ 	  are therefore configurable.
+ 
 -config DRM_DEBUG_SELFTEST
 -	tristate "kselftests for DRM"
 -	depends on DRM
 -	depends on DEBUG_KERNEL
 +config DRM_KUNIT_TEST
 +	tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
 +	depends on DRM && KUNIT
  	select PRIME_NUMBERS
  	select DRM_DISPLAY_DP_HELPER
  	select DRM_DISPLAY_HELPER