Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: build failure after merge of the drm tree
@ 2019-10-10  0:22 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2019-10-10  0:22 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from drivers/gpu/drm/i915/i915_vma.h:35,
                 from drivers/gpu/drm/i915/gt/uc/intel_guc.h:17,
                 from drivers/gpu/drm/i915/gt/uc/intel_uc.h:9,
                 from drivers/gpu/drm/i915/gt/intel_gt_types.h:16,
                 from drivers/gpu/drm/i915/i915_drv.h:81,
                 from drivers/gpu/drm/i915/i915_getparam.c:7:
drivers/gpu/drm/i915/gem/i915_gem_object.h:174:1: error: redefinition of 'i915_gem_object_never_bind_ggtt'
  174 | i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *obj)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gem/i915_gem_object.h:168:1: note: previous definition of 'i915_gem_object_never_bind_ggtt' was here
  168 | i915_gem_object_never_bind_ggtt(const struct drm_i915_gem_object *obj)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by the automatic merge of commit

  3a1fea6d2353 ("drm/i915/userptr: Never allow userptr into the mappable GGTT")

from the drm-intel-fixes tree and commits

  a4311745bba9 ("drm/i915/userptr: Never allow userptr into the mappable GGTT")
  3cbad5d77749 ("drm/i915/gem: Refactor tests on obj->ops->flags")

from the drm tree.

I fixed it up by removing the extra definition.  This sort of thing will
keep happening as longs as bugs are fixed in your development trees
and then cherry-picked back into your -fixes trees.  This practise also
causes quite a few unnecessary conflicts that each have to be checked
and merged by hand.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2019-11-05  2:54 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2019-11-05  2:54 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

After merging the drm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/platforms/embedded6xx/Kconfig:2:error: recursive dependency detected!
arch/powerpc/platforms/embedded6xx/Kconfig:2:   symbol EMBEDDED6xx depends on BROKEN_ON_SMP
init/Kconfig:79:        symbol BROKEN_ON_SMP depends on BROKEN
init/Kconfig:76:        symbol BROKEN is selected by DRM_I915_DEBUG
drivers/gpu/drm/i915/Kconfig.debug:20:  symbol DRM_I915_DEBUG depends on DRM_I915
drivers/gpu/drm/i915/Kconfig:2: symbol DRM_I915 depends on DRM
drivers/gpu/drm/Kconfig:8:      symbol DRM depends on AGP
drivers/char/agp/Kconfig:2:     symbol AGP depends on PCI
drivers/pci/Kconfig:16: symbol PCI depends on HAVE_PCI
drivers/pci/Kconfig:7:  symbol HAVE_PCI is selected by FORCE_PCI
drivers/pci/Kconfig:11: symbol FORCE_PCI is selected by MVME5100
arch/powerpc/platforms/embedded6xx/Kconfig:51:  symbol MVME5100 depends on EMBEDDED6xx
For a resolution refer to Documentation/kbuild/kconfig-language.rst
subsection "Kconfig recursive dependency limitations"

Caused by commit

  d9d54a530a70 ("drm/i915: Put future HW and their uAPIs under STAGING & BROKEN")

You really should not select BROKEN.  It is assumed to always be false
so we can make actually broken code depend on it (and therefore not
be built).

I have used the drm tree from next-20191031 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2019-07-08  4:48 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2019-07-08  4:48 UTC (permalink / raw)
  To: Dave Airlie, DRI, Al Viro
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	David Howells, Greg Hackmann, Sumit Semwal, Chenbo Feng

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

Hi all,

After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/dma-buf/dma-buf.c: In function 'dma_buf_fs_mount':
drivers/dma-buf/dma-buf.c:65:9: error: implicit declaration of function 'mount_pseudo'; did you mean 'mount_bdev'? [-Werror=implicit-function-declaration]
  return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops,
         ^~~~~~~~~~~~
         mount_bdev
drivers/dma-buf/dma-buf.c:65:9: warning: returning 'int' from a function with return type 'struct dentry *' makes pointer from integer without a cast [-Wint-conversion]
  return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops,
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    DMA_BUF_MAGIC);
    ~~~~~~~~~~~~~~

Caused by commit

  ed63bb1d1f84 ("dma-buf: give each buffer a full-fledged inode")

interacting with commit

  8d9e46d80777 ("fold mount_pseudo_xattr() into pseudo_fs_get_tree()")

from the vfs tree.

I have added the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Jul 2019 14:36:53 +1000
Subject: [PATCH] dma-buf: convert to new mount api

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/dma-buf/dma-buf.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index dc4b2c521d79..e8587c5eedb7 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -24,6 +24,7 @@
 #include <linux/reservation.h>
 #include <linux/mm.h>
 #include <linux/mount.h>
+#include <linux/pseudo_fs.h>
 
 #include <uapi/linux/dma-buf.h>
 #include <uapi/linux/magic.h>
@@ -59,16 +60,19 @@ static const struct dentry_operations dma_buf_dentry_ops = {
 
 static struct vfsmount *dma_buf_mnt;
 
-static struct dentry *dma_buf_fs_mount(struct file_system_type *fs_type,
-		int flags, const char *name, void *data)
+static int dma_buf_init_fs_context(struct fs_context *fc)
 {
-	return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops,
-			DMA_BUF_MAGIC);
+	struct pseudo_fs_context *ctx = init_pseudo(fc, DMA_BUF_MAGIC);
+
+	if (!ctx)
+		return -ENOMEM;
+	ctx->dops = &dma_buf_dentry_ops;
+	return 0;
 }
 
 static struct file_system_type dma_buf_fs_type = {
 	.name = "dmabuf",
-	.mount = dma_buf_fs_mount,
+	.init_fs_context = dma_buf_init_fs_context,
 	.kill_sb = kill_anon_super,
 };
 
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2019-04-26  2:17 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2019-04-26  2:17 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Marc-André Lureau, Linux Next Mailing List,
	Linux Kernel Mailing List, Gerd Hoffmann

[-- Attachment #1.1: Type: text/plain, Size: 1886 bytes --]

Hi all,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/virtio/virtgpu_prime.c:43:18: error: redefinition of 'virtgpu_gem_prime_get_sg_table'
 struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/virtio/virtgpu_prime.c:31:18: note: previous definition of 'virtgpu_gem_prime_get_sg_table' was here
 struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by a bad automaic merge between commit

  a0cecc23cfcb ("Revert "drm/virtio: drop prime import/export callbacks"")

from Linus' tree and commit

  98f41dc3b3ee ("drm/virtio: implement prime export")

from the drm tree.

I dropped the version of this function from the drm-fixes tree:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Apr 2019 12:13:26 +1000
Subject: [PATCH] drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/virtio/virtgpu_prime.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 0f670fc6c954..8fbf71bd0c5e 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -40,11 +40,6 @@ struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)
 				     bo->tbo.ttm->num_pages);
 }
 
-struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj)
-{
-	return ERR_PTR(-ENODEV);
-}
-
 struct drm_gem_object *virtgpu_gem_prime_import_sg_table(
 	struct drm_device *dev, struct dma_buf_attachment *attach,
 	struct sg_table *table)
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2018-05-16  6:53 Stephen Rothwell
  2018-05-16  8:09 ` Oded Gabbay
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2018-05-16  6:53 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Felix Kuehling, Linux-Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1.1: Type: text/plain, Size: 1573 bytes --]

Hi all,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'init_user_pages':
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:632:3: error: implicit declaration of function 'release_pages'; did you mean 'release_task'? [-Werror=implicit-function-declaration]
   release_pages(mem->user_pages, bo->tbo.ttm->num_pages);
   ^~~~~~~~~~~~~
   release_task

Caused by commit

  5ae0283e831a ("drm/amdgpu: Add userptr support for KFD")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 May 2018 16:43:34 +1000
Subject: [PATCH] drm/amdgpu: include pagemap.h for release_pages()

Fixes: 5ae0283e831a ("drm/amdgpu: Add userptr support for KFD"
Cc: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 72ab2b1ffe75..ff8fd75f7ca5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -23,6 +23,7 @@
 #define pr_fmt(fmt) "kfd2kgd: " fmt
 
 #include <linux/list.h>
+#include <linux/pagemap.h>
 #include <linux/sched/mm.h>
 #include <drm/drmP.h>
 #include "amdgpu_object.h"
-- 
2.17.0

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2018-03-13  5:46 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2018-03-13  5:46 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rex Zhu,
	Alex Deucher

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

Hi all,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/smu7_hwmgr.c: In function 'smu7_notify_link_speed_change_after_state_change':
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/smu7_hwmgr.c:3830:7: error: implicit declaration of function 'amdgpu_acpi_pcie_performance_request'; did you mean 'smu7_pcie_performance_request'? [-Werror=implicit-function-declaration]
   if (amdgpu_acpi_pcie_performance_request(hwmgr->adev, request, false)) {
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       smu7_pcie_performance_request

Caused by commit

  e1deba285156 ("drm/amd/pp: Use amdgpu acpi helper functions in powerplay")

and commit

  37a94791a097 ("drm/amd/pp: Add #ifdef checks for CONFIG_ACPI")

missed this instance.

I added this hack patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Mar 2018 16:24:31 +1100
Subject: [PATCH] drm/amd/pp: add another CONFIG_ACPI check

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index d4d1d2e7e233..df2a312ca6c9 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -3827,12 +3827,14 @@ static int smu7_notify_link_speed_change_after_state_change(
 				smu7_get_current_pcie_speed(hwmgr) > 0)
 			return 0;
 
+#ifdef CONFIG_ACPI
 		if (amdgpu_acpi_pcie_performance_request(hwmgr->adev, request, false)) {
 			if (PP_PCIEGen2 == target_link_speed)
 				pr_info("PSPP request to switch to Gen2 from Gen3 Failed!");
 			else
 				pr_info("PSPP request to switch to Gen1 from Gen2 Failed!");
 		}
+#endif
 	}
 
 	return 0;
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2018-01-02  1:48 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2018-01-02  1:48 UTC (permalink / raw)
  To: Dave Airlie, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jerry (Fangzhi) Zuo, Alex Deucher

Hi all,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:219:6: error: redefinition of 'dm_dp_mst_dc_sink_create'
 void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
      ^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:183:6: note: previous definition of 'dm_dp_mst_dc_sink_create' was here
 void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
      ^

Caused by commit

  391ef035200f ("drm/amd/display: Fix rehook MST display not light back on")

automatically mergeing badly with commit

  becd0875f439 ("drm/amd/display: Fix rehook MST display not light back on")

from Linus' tree.

I applied this merge fix patch (to remove the second copy of
dm_dp_mst_dc_sink_create):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jan 2018 12:43:32 +1100
Subject: [PATCH] drm/amd/display: fix mismerge of identical patches

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    | 36 ----------------------
 1 file changed, 36 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 7ace4dd302c1..f3d87f418d2e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -216,42 +216,6 @@ void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
 					&aconnector->base, aconnector->edid);
 }
 
-void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
-{
-	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
-	struct edid *edid;
-	struct dc_sink *dc_sink;
-	struct dc_sink_init_data init_params = {
-			.link = aconnector->dc_link,
-			.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
-
-	edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
-
-	if (!edid) {
-		drm_mode_connector_update_edid_property(
-			&aconnector->base,
-			NULL);
-		return;
-	}
-
-	aconnector->edid = edid;
-
-	dc_sink = dc_link_add_remote_sink(
-		aconnector->dc_link,
-		(uint8_t *)aconnector->edid,
-		(aconnector->edid->extensions + 1) * EDID_LENGTH,
-		&init_params);
-
-	dc_sink->priv = aconnector;
-	aconnector->dc_sink = dc_sink;
-
-	amdgpu_dm_add_sink_to_freesync_module(
-			connector, aconnector->edid);
-
-	drm_mode_connector_update_edid_property(
-					&aconnector->base, aconnector->edid);
-}
-
 static int dm_dp_mst_get_modes(struct drm_connector *connector)
 {
 	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
-- 
2.15.0

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2017-09-28  4:57 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2017-09-28  4:57 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rex Zhu,
	Alex Deucher

Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.o:(.opd+0xd8): multiple definition of `ci_send_msg_to_smc'
drivers/gpu/drm/radeon/ci_smc.o:(.opd+0xc0): first defined here
drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.o: In function `.ci_send_msg_to_smc':
(.text+0xea0): multiple definition of `.ci_send_msg_to_smc'
drivers/gpu/drm/radeon/ci_smc.o:(.text+0x760): first defined here


Caused by commit

  9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)")

I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Sep 2017 14:50:51 +1000
Subject: [PATCH] drm/amd/powerplay: uniquify ci_send_msg_to_smc

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c    | 4 ++--
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h    | 2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
index 9ee14315dce7..fcf88b8fc738 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
@@ -208,7 +208,7 @@ static int ci_read_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr,
 	return 0;
 }
 
-int ci_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg)
+int sumgr_ci_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg)
 {
 	int ret;
 
@@ -231,7 +231,7 @@ int ci_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr,
 					uint16_t msg, uint32_t parameter)
 {
 	cgs_write_register(hwmgr->device, mmSMC_MSG_ARG_0, parameter);
-	return ci_send_msg_to_smc(hwmgr, msg);
+	return sumgr_ci_send_msg_to_smc(hwmgr, msg);
 }
 
 static void ci_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h
index cc4176d2d25f..61d17e354d6d 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h
@@ -32,7 +32,7 @@ struct amd_pp_profile;
 
 int ci_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr,
 					uint16_t msg, uint32_t parameter);
-int ci_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg);
+int sumgr_ci_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg);
 int ci_populate_all_graphic_levels(struct pp_hwmgr *hwmgr);
 int ci_populate_all_memory_levels(struct pp_hwmgr *hwmgr);
 int ci_init_smc_table(struct pp_hwmgr *hwmgr);
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index f265f42a7ed3..ce3c13f9e97b 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -68,7 +68,7 @@ const struct pp_smumgr_func ci_smu_funcs = {
 	.check_fw_load_finish = NULL,
 	.request_smu_load_fw = NULL,
 	.request_smu_load_specific_fw = NULL,
-	.send_msg_to_smc = ci_send_msg_to_smc,
+	.send_msg_to_smc = sumgr_ci_send_msg_to_smc,
 	.send_msg_to_smc_with_parameter = ci_send_msg_to_smc_with_parameter,
 	.download_pptable_settings = NULL,
 	.upload_pptable_settings = NULL,
-- 
2.14.1

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2017-03-20  0:51 Stephen Rothwell
  2017-03-20  8:03 ` Daniel Vetter
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2017-03-20  0:51 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Jani Nikula, linux-next, linux-kernel

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/i915_irq.c: In function 'gen6_rps_reset_ei':
drivers/gpu/drm/i915/i915_irq.c:1115:38: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
  vlv_c0_read(dev_priv, &dev_priv->rps.down_ei);
                                      ^
drivers/gpu/drm/i915/i915_irq.c:1116:15: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
  dev_priv->rps.up_ei = dev_priv->rps.down_ei;
               ^
drivers/gpu/drm/i915/i915_irq.c:1116:37: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
  dev_priv->rps.up_ei = dev_priv->rps.down_ei;
                                     ^
drivers/gpu/drm/i915/i915_irq.c: In function 'vlv_wa_c0_ei':
drivers/gpu/drm/i915/i915_irq.c:1133:21: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
       &dev_priv->rps.down_ei, &now,
                     ^
drivers/gpu/drm/i915/i915_irq.c:1136:16: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
   dev_priv->rps.down_ei = now;
                ^
drivers/gpu/drm/i915/i915_irq.c:1141:20: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
      &dev_priv->rps.up_ei, &now,
                    ^
drivers/gpu/drm/i915/i915_irq.c:1144:16: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
   dev_priv->rps.up_ei = now;
                ^
Caused by commit

  8f68d591d476 ("drm/i915: Stop using RP_DOWN_EI on Baytrail")

from the drm-intel-fixes tree and a bad merge resolution on my part.

I reapplied that commit by hand.  It would be nice if this conflict was
resolved in the drm tree.

This cherry picking of fixes from new development back to Linus' tree
can be a real pain when so many other changes happen in the same files.

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2017-02-23 23:25 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2017-02-23 23:25 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Noralf Trønnes

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:198:26: error: redefinition of 'tinydrm_of_find_backlight'
 struct backlight_device *tinydrm_of_find_backlight(struct device *dev)
                          ^
In file included from drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:11:0:
include/drm/tinydrm/tinydrm-helpers.h:53:1: note: previous definition of 'tinydrm_of_find_backlight' was here
 tinydrm_of_find_backlight(struct device *dev)
 ^
drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:230:5: error: redefinition of 'tinydrm_enable_backlight'
 int tinydrm_enable_backlight(struct backlight_device *backlight)
     ^
In file included from drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:11:0:
include/drm/tinydrm/tinydrm-helpers.h:58:19: note: previous definition of 'tinydrm_enable_backlight' was here
 static inline int tinydrm_enable_backlight(struct backlight_device *backlight)
                   ^
drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:258:5: error: redefinition of 'tinydrm_disable_backlight'
 int tinydrm_disable_backlight(struct backlight_device *backlight)
     ^
In file included from drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c:11:0:
include/drm/tinydrm/tinydrm-helpers.h:64:1: note: previous definition of 'tinydrm_disable_backlight' was here
 tinydrm_disable_backlight(struct backlight_device *backlight)
 ^

Caused by commit

  9f69eb5c36a6 ("drm/tinydrm: Add helper functions")

I have used the drm tree from next-20170223 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2017-01-24  1:25 Stephen Rothwell
  2017-01-25 10:52 ` Vincent ABRIOU
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2017-01-24  1:25 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Vincent Abriou, Ville Syrjälä

Hi Dave,

After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/sti/sti_plane.c: In function 'sti_plane_update_fps':
drivers/gpu/drm/sti/sti_plane.c:76:33: error: 'struct drm_framebuffer' has no member named 'pixel_format'
     (char *)&plane->drm_plane.fb->pixel_format,
                                 ^

Caused by commit

  a69e466b0666 ("drm/sti: update fps debugfs entries")

Interacting with commit

  438b74a5497c ("drm: Nuke fb->pixel_format")

This should have been fixed up in commit

  d64a1661c8f7 ("Merge tag 'sti-drm-next-2017-01-06' of https://github.com/vinceab/linux into drm-next")

I have used the drm tree from next-20170123 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2016-07-15  3:40 Stephen Rothwell
  2016-07-15  4:32 ` Sedat Dilek
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2016-07-15  3:40 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

In file included from drivers/gpu/drm/i915/intel_opregion.c:34:0:
drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_get_panel_type':
drivers/gpu/drm/i915/intel_opregion.c:1042:17: error: 'dev' undeclared (first use in this function)
  if (IS_SKYLAKE(dev)) {
                 ^
drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__'
  if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \
                                           ^
drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO'
 #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake)
                          ^
drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE'
  if (IS_SKYLAKE(dev)) {
      ^
drivers/gpu/drm/i915/intel_opregion.c:1042:17: note: each undeclared identifier is reported only once for each function it appears in
  if (IS_SKYLAKE(dev)) {
                 ^
drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__'
  if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \
                                           ^
drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO'
 #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake)
                          ^
drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE'
  if (IS_SKYLAKE(dev)) {
      ^

Caused by commit

  6f9f4b7a2cf7 ("drm/i915/opregion: Convert to using native drm_i915_private")

interacting with commit

  aeddda06c1a7 ("drm/i915: Ignore panel type from OpRegion on SKL")

from the drm-intel-fixes tree.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Jul 2016 13:34:05 +1000
Subject: [PATCH] drm/i915/opregion: fix up for argument change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_opregion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 21f19641e33e..dcdb346b596c 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -1039,7 +1039,7 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
 	 * vswing instead. Low vswing results in some display flickers, so
 	 * let's simply ignore the OpRegion panel type on SKL for now.
 	 */
-	if (IS_SKYLAKE(dev)) {
+	if (IS_SKYLAKE(dev_priv)) {
 		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
 		return -ENODEV;
 	}
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2016-04-28  1:57 Stephen Rothwell
  2016-04-28  8:11 ` Jani Nikula
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2016-04-28  1:57 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Mika Kahola, Jani Nikula

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_prepare_ddi_buffer':
drivers/gpu/drm/i915/intel_ddi.c:447:15: error: 'struct drm_i915_private' has no member named 'edp_low_vswing'
   if (dev_priv->edp_low_vswing) {
               ^

Caused by commit

  06411f08b3f3 ("drm/i915: move edp low vswing config to vbt data")

interacting with commit

  992e7a41f9fc ("drm/i915: Fix eDP low vswing for Broadwell")

from the drm-intel-fixes tree.

I applied the following merge fixup patch (which is suggested by the "v3:
Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing"
comment in the drm-intel-fixes tree patch, but clearly could not be
done there).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2016 11:53:36 +1000
Subject: [PATCH] drm/i915: fix up for edp_low_vswing change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_ddi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 6080b5481984..e304857ba405 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -444,7 +444,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
 		ddi_translations_fdi = bdw_ddi_translations_fdi;
 		ddi_translations_dp = bdw_ddi_translations_dp;
 
-		if (dev_priv->edp_low_vswing) {
+		if (dev_priv->vbt.edp.low_vswing) {
 			ddi_translations_edp = bdw_ddi_translations_edp;
 			n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
 		} else {
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2016-03-17  4:41 Stephen Rothwell
  2016-03-17  8:41 ` Christian König
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2016-03-17  4:41 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Christian König, Alex Deucher

Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c: In function 'amdgpu_gem_userptr_ioctl':
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c:321:2: error: implicit declaration of function 'release_pages' [-Werror=implicit-function-declaration]
  release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages, false);
  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c: In function 'amdgpu_cs_parser_bos':
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:410:5: error: implicit declaration of function 'release_pages' [-Werror=implicit-function-declaration]
     release_pages(e->user_pages,
     ^

Caused by commit

  2f568dbd6b94 ("drm/amdgpu: move get_user_pages out of amdgpu_ttm_tt_pin_userptr v6")

Presumably a forgotten include file.

I added this fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Mar 2016 15:30:49 +1100
Subject: [PATCH] drm/amdgpu: release_pages requires linux/pagemap.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4f5ef4149e87..9392e50a7ba4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -25,6 +25,7 @@
  *    Jerome Glisse <glisse@freedesktop.org>
  */
 #include <linux/list_sort.h>
+#include <linux/pagemap.h>
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 1ecdf6c01368..0f2391ec1ed9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -26,6 +26,7 @@
  *          Jerome Glisse
  */
 #include <linux/ktime.h>
+#include <linux/pagemap.h>
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2016-02-22  0:45 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2016-02-22  0:45 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of 'amdgpu_ttm_tt_affect_userptr'
 bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
      ^
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:799:6: note: previous definition of 'amdgpu_ttm_tt_affect_userptr' was here
 bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
      ^

Caused by a bad git resolution in commit

  971f3e7dd355 ("Merge remote-tracking branch 'drm/drm-next'")

I have added the following as a merge fix up patch and can carry it
as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Feb 2016 11:40:08 +1100
Subject: [PATCH] drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index b3e90cd91496..9ccdd189d717 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -815,25 +815,6 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
 	return true;
 }
 
-bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
-				  unsigned long end)
-{
-	struct amdgpu_ttm_tt *gtt = (void *)ttm;
-	unsigned long size;
-
-	if (gtt == NULL)
-		return false;
-
-	if (gtt->ttm.ttm.state != tt_bound || !gtt->userptr)
-		return false;
-
-	size = (unsigned long)gtt->ttm.ttm.num_pages * PAGE_SIZE;
-	if (gtt->userptr > end || gtt->userptr + size <= start)
-		return false;
-
-	return true;
-}
-
 bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm)
 {
 	struct amdgpu_ttm_tt *gtt = (void *)ttm;
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-12-31 10:31 Stephen Rothwell
  2016-01-07  2:44 ` Stephen Rothwell
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-12-31 10:31 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Rex Zhu, Alex Deucher

Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c: In function 'tonga_fan_ctrl_get_fan_speed_percent':
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c:84:2: error: implicit declaration of function 'do_div' [-Werror=implicit-function-declaration]
  do_div(tmp64, duty100);
  ^
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/fiji_thermal.c: In function 'fiji_fan_ctrl_get_fan_speed_percent':
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/fiji_thermal.c:78:2: error: implicit declaration of function 'do_div' [-Werror=implicit-function-declaration]
  do_div(tmp64, duty100);
  ^

Caused by commit

  1e4854e96c35 ("drm/amdgpu/powerplay: implement thermal control for tonga.")

[I notice that that commit does not have a Signed-off-by from its
committer (Alex)]

I applied the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 31 Dec 2015 21:20:20 +1100
Subject: [PATCH] drm/amdgpu/powerplay: include asm/div64.h for do_div()

Fixes: 1e4854e96c35 ("drm/amdgpu/powerplay: implement thermal control for tonga.")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c  | 2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
index def57d0675ed..e76a7de9aa32 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
+#include <asm/div64.h>
 #include "fiji_thermal.h"
 #include "fiji_hwmgr.h"
 #include "fiji_smumgr.h"
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
index 2e159b003e71..a188174747c9 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
+#include <asm/div64.h>
 #include "tonga_thermal.h"
 #include "tonga_hwmgr.h"
 #include "tonga_smumgr.h"
-- 
2.6.4

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-12-31  2:40 Stephen Rothwell
  2015-12-31  5:14 ` Mark yao
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-12-31  2:40 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Mark Yao

Hi Dave,

After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: "vop_component_ops" [drivers/gpu/drm/rockchip/rockchip_vop_reg.ko] undefined!

Caused by commit

  a67719d18229 ("drm/rockchip: vop: spilt register related into rockchip_reg_vop.c")

I have added the following fix patch for today (just because its
Christmas :-)):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 31 Dec 2015 13:35:27 +1100
Subject: [PATCH] drm/rockchip: vop: export vop_component_ops to modules

Fixes: a67719d18229 ("drm/rockchip: vop: spilt register related into rockchip_reg_vop.c")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index d83bf87ba71e..f5b3da2f92d7 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1395,3 +1395,4 @@ const struct component_ops vop_component_ops = {
 	.bind = vop_bind,
 	.unbind = vop_unbind,
 };
+EXPORT_SYMBOL_GPL(vop_component_ops);
-- 
2.6.4

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-11-04  9:22 Stephen Rothwell
  2015-11-09 16:45 ` Guenter Roeck
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-11-04  9:22 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Alexandre Courbot, Ben Skeggs

Hi Dave,

After merging the drm tree, today's linux-next build (s390 allmodconfig)
failed like this:

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:143:2: error: implicit declaration of function 'dma_to_phys' [-Werror=implicit-function-declaration]

Caused by commit

  69c4938249fb ("drm/nouveau/instmem/gk20a: use direct CPU access")

Discovered after the release.

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-10-06  1:09 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2015-10-06  1:09 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Alex Deucher, Daniel Vetter

Hi Dave,

After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/drm_fb_helper.c: In function 'restore_fbdev_mode':
drivers/gpu/drm/drm_fb_helper.c:448:5: error: 'error' undeclared (first use in this function)
     error = true;
     ^

Caused by commit

  03f9abb28c3e ("drm: handle cursor_set2 in restore_fbdev_mode")

>From Linus' tree interacting with commit

  b7bdf0a87add ("drm/fb-helper: Use -errno return in restore_mode_unlocked")

from the drm tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Oct 2015 12:04:49 +1100
Subject: [PATCH] drm/fb-helper: merge fix for "Use -errno return in restore_mode_unlocked"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/drm_fb_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 97d1a4633c5c..bd6d4ab27512 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -445,7 +445,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 		if (crtc->funcs->cursor_set2) {
 			ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0);
 			if (ret)
-				error = true;
+				return ret;
 		} else if (crtc->funcs->cursor_set) {
 			ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
 			if (ret)
-- 
2.5.1

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-06-09 13:42 Stephen Rothwell
  2015-06-09 14:02 ` Deucher, Alexander
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-06-09 13:42 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Alex Deucher

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

Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c: In function 'gfx_v7_0_cp_gfx_resume':
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2879:9: error: 'BUF_SWAP_32BIT' undeclared (first use in this function)
  tmp |= BUF_SWAP_32BIT;
         ^
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2879:9: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c: In function 'gfx_v7_0_cp_compute_resume':
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3398:41: error: 'BUF_SWAP_32BIT' undeclared (first use in this function)
   mqd->queue_state.cp_hqd_pq_control |= BUF_SWAP_32BIT;
                                         ^
drivers/gpu/drm/amd/amdgpu/cik_sdma.c: In function 'cik_sdma_gfx_resume':
drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:14: error: 'SDMA_RB_SWAP_ENABLE' undeclared (first use in this function)
   rb_cntl |= SDMA_RB_SWAP_ENABLE | SDMA_RPTR_WRITEBACK_SWAP_ENABLE;
              ^
drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:14: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:36: error: 'SDMA_RPTR_WRITEBACK_SWAP_ENABLE' undeclared (first use in this function)
   rb_cntl |= SDMA_RB_SWAP_ENABLE | SDMA_RPTR_WRITEBACK_SWAP_ENABLE;
                                    ^

Caused by commit a2e73f56fa62 ("drm/amdgpu: Add support for CIK parts").

I added the following patch to disable this code for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Jun 2015 23:38:30 +1000
Subject: [PATCH] drm/amdgpu: disable CIK parts for now

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index b30fcfa4b1f2..8da6bf7f39c8 100644
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -1,6 +1,7 @@
 config DRM_AMDGPU_CIK
 	bool "Enable amdgpu support for CIK parts"
 	depends on DRM_AMDGPU
+	depends on BROKEN
 	help
 	  Choose this option if you want to enable experimental support
 	  for CIK asics.
-- 
2.1.4

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

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-05-20  3:08 Stephen Rothwell
  2015-05-20  4:41 ` Dave Airlie
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-05-20  3:08 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Oded Gabbay, Alex Deucher

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

Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c: In function 'create_queue_cpsch':
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:888:2: error: implicit declaration of function 'init_sdma_vm' [-Werror=implicit-function-declaration]
  init_sdma_vm(dqm, q, qpd);
  ^

Caused by commit 3e3f6e1a90a8 ("drm/amdkfd: make the sdma vm init to be
asic specific").

I have used the drm tree from next-20150519 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2015-01-29  2:38 Stephen Rothwell
  2015-01-29  8:21 ` Oded Gabbay
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2015-01-29  2:38 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Oded Gabbay, Ben Goz

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdkfd/kfd_device.c: In function 'kgd2kfd_device_init':
drivers/gpu/drm/amd/amdkfd/kfd_device.c:193:11: error: 'max_num_of_processes' undeclared (first use in this function)
  size += (max_num_of_processes * sizeof(struct pm4_map_process) +
           ^
drivers/gpu/drm/amd/amdkfd/kfd_device.c:193:11: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/amd/amdkfd/kfd_device.c:194:26: error: 'max_num_of_queues_per_process' undeclared (first use in this function)
   max_num_of_processes * max_num_of_queues_per_process *
                          ^

Caused by commit b8cbab042cd6 ("drm/amdkfd: Allow user to limit only
queues per device") from Linus' tree interacting with commit
e18e794e6ba0 ("drm/amdkfd: Fixed calculation of gart buffer size") from
the drm tree.

I couldn't easily figure out how to fix this, so I just disabled the
driver using the patch below.  Please let me know when it is fixed, or
provide me with a merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Jan 2015 13:34:22 +1100
Subject: [PATCH] drm/amdkfd: disable driver due to interaction with a bug fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdkfd/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/Kconfig b/drivers/gpu/drm/amd/amdkfd/Kconfig
index 8dfac37ff327..e96b4d6e3567 100644
--- a/drivers/gpu/drm/amd/amdkfd/Kconfig
+++ b/drivers/gpu/drm/amd/amdkfd/Kconfig
@@ -5,5 +5,6 @@
 config HSA_AMD
 	tristate "HSA kernel driver for AMD GPU devices"
 	depends on DRM_RADEON && AMD_IOMMU_V2 && X86_64
+	depends on BROKEN
 	help
 	  Enable this if you want to use HSA features on AMD GPU devices.
-- 
2.1.4

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

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2014-09-08  4:26 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2014-09-08  4:26 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Paulo Zanoni, Jani Nikula,
	Ville Syrjälä,
	Daniel Vetter

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/intel_display.c: In function 'intel_crtc_cursor_set_obj':
drivers/gpu/drm/i915/intel_display.c:8302:24: error: 'dev_priv' undeclared (first use in this function)
   intel_runtime_pm_get(dev_priv);
                        ^

Caused by commit d7ce484eeec4 ("drm/i915: Move CURSIZE setup to
i845_update_cursor()") interacting with commit d6dd6843ff4a ("drm/i915:
fix plane/cursor handling when runtime suspended") from Linus' tree.

I am not sure why this hasn't failed before as both commits have been
in linux-next since (at least) Sept 3.

I have applied this merge fix patch (which reverts part of d7ce484eeec4):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Sep 2014 14:17:21 +1000
Subject: [PATCH] drm/i915: fix up for recent merge

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a1acf8376c0f..18da8349a070 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8253,6 +8253,7 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
 				     uint32_t width, uint32_t height)
 {
 	struct drm_device *dev = crtc->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	enum pipe pipe = intel_crtc->pipe;
 	unsigned old_width, stride;
-- 
2.1.0

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

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2014-06-05  4:12 Stephen Rothwell
  2014-06-05  4:28 ` Stephen Rothwell
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2014-06-05  4:12 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Chris Wilson, Daniel Vetter, Jani Nikula

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/i915/intel_fbdev.c: In function 'intel_fb_initial_config':
drivers/gpu/drm/i915/intel_fbdev.c:392:4: error: implicit declaration of function 'drm_get_connector_name' [-Werror=implicit-function-declaration]
    DRM_DEBUG_KMS("using first mode listed on connector %s\n",
    ^

Caused by commits c0c97622c1bd ("drm/i915: Use the connector name in
fbdev debug messages") and c23cc4178dd1 ("drm/i915: replace
drm_get_connector_name() with direct name field use").

I have used the drm tree from next-20140604 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-09-24  3:18 Stephen Rothwell
  2012-09-24 11:31 ` Daniel Vetter
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2012-09-24  3:18 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Daniel Vetter, Wang Xingchao

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/intel_hdmi.c: In function 'intel_enable_hdmi':
drivers/gpu/drm/i915/intel_hdmi.c:633:31: error: 'mode' undeclared (first use in this function)

Caused by commit b98b60167279 ("drm/i915: HDMI - Clear Audio Enable bit
for Hot Plug") from Linus' tree interacting with commit 5ab432ef4997
("drm/i915/hdmi: convert to encoder->disable/enable") from the drm tree.

I added the following merge fix patch (which may be wrong, of course):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 13:14:40 +1000
Subject: [PATCH] drm/i915: HDMI: update for API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_hdmi.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2ec9c76..d39ed58 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -630,7 +630,7 @@ static void intel_enable_hdmi(struct intel_encoder *encoder)
 	u32 temp;
 	u32 enable_bits = SDVO_ENABLE;
 
-	if (intel_hdmi->has_audio || mode != DRM_MODE_DPMS_ON)
+	if (intel_hdmi->has_audio)
 		enable_bits |= SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);
@@ -676,8 +676,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
 	u32 temp;
 	u32 enable_bits = SDVO_ENABLE;
 
-	if (intel_hdmi->has_audio)
-		enable_bits |= SDVO_AUDIO_ENABLE;
+	enable_bits |= SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);
 
-- 
1.7.10.280.gaa39

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-08-24  3:49 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2012-08-24  3:49 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Alan Cox

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/gma500/cdv_intel_display.c: In function 'cdv_intel_crtc_mode_set':
drivers/gpu/drm/gma500/cdv_intel_display.c:1129:3: error: implicit declaration of function 'cdv_intel_dp_set_m_n' [-Werror=implicit-function-declaration]

Introducd by commit 220801bdb53c ("gma500/cdv: add the bits that don't
need the new code") and exposed by commit f76c0dde78fb ("gma500/cdv: Fix
call to cdv_intel_dp_set_m_n").

I have used the drm tree form next-20120823 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-05-17  3:47 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2012-05-17  3:47 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Matthew Garrett, H. Peter Anvin

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/pci/fixup.c: In function 'pci_fixup_video':
arch/x86/pci/fixup.c:352:3: error: implicit declaration of function 'vga_default_device' [-Werror=implicit-function-declaration]
arch/x86/pci/fixup.c:353:4: error: implicit declaration of function 'vga_set_default_device' [-Werror=implicit-function-declaration]

Caused by commit 6cf20beec4b9 ("x86/vga: set the default device from the
fixup").

I have used the drm tree from next-20120516 for today.

If it is relevant, I merged the drm tree before the sound tree today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-04-30  3:22 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2012-04-30  3:22 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Adam Jackson, Alex Deucher, Chris Wilson

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/drm_edid_load.c: In function 'edid_load':
drivers/gpu/drm/drm_edid_load.c:176:2: error: too few arguments to function 'drm_edid_block_valid'
include/drm/drm_crtc.h:1015:13: note: declared here
drivers/gpu/drm/drm_edid_load.c:188:3: error: too few arguments to function 'drm_edid_block_valid'

Caused by commit f89ec8a456dd ("drm/edid: Try harder to fix up base EDID
blocks"). drivers/gpu/drm/drm_edid_load.c was added before v3.4-rc1 ...
grep is your friend.

I have used the drm tree from next-20120427 for today.

-- 
Stephen Rothwell <sfr@canb.auug.org.au>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-04-23  3:42 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2012-04-23  3:42 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Matthew Garrett

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "vga_default_device" [arch/x86/video/fbdev.ko] undefined!

Caused by commit 49c33b97c5f4 ("x86: Use vga_default_device() when
determining whether an fb is primary").

I have used the drm tree from next-20120420 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2012-03-16  2:53 Stephen Rothwell
  2012-03-19  2:45 ` Stephen Rothwell
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2012-03-16  2:53 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "drm_usb_init" [drivers/gpu/drm/udl/udl.ko] undefined!
ERROR: "drm_get_usb_dev" [drivers/gpu/drm/udl/udl.ko] undefined!
ERROR: "drm_usb_exit" [drivers/gpu/drm/udl/udl.ko] undefined!

Caused by commit 5320918b9a87 ("drm/udl: initial UDL driver (v4)").

I have used the drm tree from next-20120315 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

P.S. on the bright side, I didn't get any conflicts in the merge ...

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2011-11-28  2:49 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2011-11-28  2:49 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Arjan van de Ven, Alan Cox

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/gma500/psb_drv.c: At top level:
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: braces around scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: initialization from incompatible pointer type [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: (near initialization for 'driver.fops') [enabled by default]

Caused by commit 5c49fd3aa0ab ("gma500: Add the core DRM files and
headers") interacting with commit e08e96de986c ("drm: Make the per-driver
file_operations struct const").  Again needed fixing up in commit
b63e0f9cb433 ("Merge branch 'drm-gma500-alanc' into drm-core-next").  Or
Alan should do his work based on the drm-next tree (which would then have
to become non rebasing) ...

I have used the version of the drm tree from next-20111115 again.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2011-11-16  0:30 Stephen Rothwell
  2011-11-16 10:16 ` Alan Cox
  2011-11-25  1:49 ` Stephen Rothwell
  0 siblings, 2 replies; 82+ messages in thread
From: Stephen Rothwell @ 2011-11-16  0:30 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Jesse Barnes, Ville Syrjälä,
	Alan Cox, Rob Clark

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

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/staging/gma500/framebuffer.c: In function 'psb_user_framebuffer_create':
drivers/staging/gma500/framebuffer.c:558:44: error: 'struct drm_mode_fb_cmd2' has no member named 'handle'

Caused by commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes
a pixel format v5").  Please build test *before* publishing code.  :-(

I have used the drm tree from next-20111115 for today.

I also get the following warnings in that file:

drivers/staging/gma500/framebuffer.c: In function 'psb_framebuffer_init':
drivers/staging/gma500/framebuffer.c:297:2: warning: passing argument 2 of 'drm_helper_mode_fill_fb_struct' from incompatible pointer type [enabled by default]
include/drm/drm_crtc_helper.h:121:12: note: expected 'struct drm_mode_fb_cmd2 *' but argument is of type 'struct drm_mode_fb_cmd *'
drivers/staging/gma500/framebuffer.c:564:2: warning: passing argument 2 of 'psb_framebuffer_create' from incompatible pointer type [enabled by default]
drivers/staging/gma500/framebuffer.c:314:32: note: expected 'struct drm_mode_fb_cmd *' but argument is of type 'struct drm_mode_fb_cmd2 *'

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2011-03-15  3:49 Stephen Rothwell
  0 siblings, 0 replies; 82+ messages in thread
From: Stephen Rothwell @ 2011-03-15  3:49 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Alex Deucher

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/radeon/ni.c: In function 'cayman_cp_enable':
drivers/gpu/drm/radeon/ni.c:1042: error: 'struct radeon_mc' has no member named 'active_vram_size'

Caused by commit 0c88a02ef6b7 ("drm/radeon/kms: add support for CP setup
on cayman asics") interacting with commit 5359533801e3 ("drm/radeon: fix
problem with changing active VRAM size. (v2)") from Linus' tree.

I allied the following fix up patch for today (I am not sure if it is
correct).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2011 14:44:59 +1100
Subject: [PATCH] drm/radeon/kms: update for active_vram_size removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/radeon/ni.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 8c199c4..7aade20 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1039,7 +1039,7 @@ static void cayman_cp_enable(struct radeon_device *rdev, bool enable)
 	if (enable)
 		WREG32(CP_ME_CNTL, 0);
 	else {
-		rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
+		radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
 		WREG32(CP_ME_CNTL, (CP_ME_HALT | CP_PFP_HALT));
 		WREG32(SCRATCH_UMSK, 0);
 	}
-- 
1.7.4.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply	[flat|nested] 82+ messages in thread
* linux-next: build failure after merge of the drm tree
@ 2010-04-08  3:12 Stephen Rothwell
  2010-04-08  3:52 ` Dave Airlie
  0 siblings, 1 reply; 82+ messages in thread
From: Stephen Rothwell @ 2010-04-08  3:12 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Pauli Nieminen, Jerome Glisse

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/ttm/ttm_page_alloc.c: In function 'ttm_page_pool_free':
drivers/gpu/drm/ttm/ttm_page_alloc.c:311: error: implicit declaration of function 'kmalloc'
drivers/gpu/drm/ttm/ttm_page_alloc.c:312: warning: assignment makes pointer from integer without a cast
drivers/gpu/drm/ttm/ttm_page_alloc.c:375: error: implicit declaration of function 'kfree'
drivers/gpu/drm/ttm/ttm_page_alloc.c: In function 'ttm_alloc_new_pages':
drivers/gpu/drm/ttm/ttm_page_alloc.c:483: warning: assignment makes pointer from integer without a cast

Caused by commit 1403b1a38e8b19a4cc17e2c158e278628943a436 ("drm/ttm: add
pool wc/uc page allocator V3") interacting with the removal of slab.h
from percpu.h.

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Apr 2010 13:05:05 +1000
Subject: [PATCH] drm/ttm: using kmalloc/kfree requires including slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/ttm/ttm_page_alloc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 6ca9b27..d6c40bd 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -36,6 +36,7 @@
 #include <linux/mm_types.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 
 #include <asm/atomic.h>
 #include <asm/agp.h>
-- 
1.7.0.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply	[flat|nested] 82+ messages in thread

end of thread, back to index

Thread overview: 82+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10  0:22 linux-next: build failure after merge of the drm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-11-05  2:54 Stephen Rothwell
2019-07-08  4:48 Stephen Rothwell
2019-04-26  2:17 Stephen Rothwell
2018-05-16  6:53 Stephen Rothwell
2018-05-16  8:09 ` Oded Gabbay
2018-05-17  5:00   ` Dave Airlie
2018-03-13  5:46 Stephen Rothwell
2018-01-02  1:48 Stephen Rothwell
2017-09-28  4:57 Stephen Rothwell
2017-03-20  0:51 Stephen Rothwell
2017-03-20  8:03 ` Daniel Vetter
2017-03-20  8:05   ` Daniel Vetter
2017-02-23 23:25 Stephen Rothwell
2017-01-24  1:25 Stephen Rothwell
2017-01-25 10:52 ` Vincent ABRIOU
2016-07-15  3:40 Stephen Rothwell
2016-07-15  4:32 ` Sedat Dilek
2016-04-28  1:57 Stephen Rothwell
2016-04-28  8:11 ` Jani Nikula
2016-03-17  4:41 Stephen Rothwell
2016-03-17  8:41 ` Christian König
2016-02-22  0:45 Stephen Rothwell
2015-12-31 10:31 Stephen Rothwell
2016-01-07  2:44 ` Stephen Rothwell
2016-01-11 22:54   ` Stephen Rothwell
2016-01-12  0:31     ` Dave Airlie
2016-01-12  4:35       ` Stephen Rothwell
2016-01-12  7:48         ` Zhu, Rex
2015-12-31  2:40 Stephen Rothwell
2015-12-31  5:14 ` Mark yao
2015-11-04  9:22 Stephen Rothwell
2015-11-09 16:45 ` Guenter Roeck
2015-11-10  4:55   ` Alexandre Courbot
2015-10-06  1:09 Stephen Rothwell
2015-06-09 13:42 Stephen Rothwell
2015-06-09 14:02 ` Deucher, Alexander
2015-06-10  0:28   ` Stephen Rothwell
2015-05-20  3:08 Stephen Rothwell
2015-05-20  4:41 ` Dave Airlie
2015-05-20  5:25   ` Stephen Rothwell
2015-05-20  5:31     ` Stephen Rothwell
2015-05-20  6:01       ` Oded Gabbay
2015-05-20  6:08         ` Dave Airlie
2015-01-29  2:38 Stephen Rothwell
2015-01-29  8:21 ` Oded Gabbay
2015-01-29  9:35   ` Stephen Rothwell
2014-09-08  4:26 Stephen Rothwell
2014-06-05  4:12 Stephen Rothwell
2014-06-05  4:28 ` Stephen Rothwell
2012-09-24  3:18 Stephen Rothwell
2012-09-24 11:31 ` Daniel Vetter
2012-09-24 11:58   ` Stephen Rothwell
2012-08-24  3:49 Stephen Rothwell
2012-05-17  3:47 Stephen Rothwell
2012-04-30  3:22 Stephen Rothwell
2012-04-23  3:42 Stephen Rothwell
2012-03-16  2:53 Stephen Rothwell
2012-03-19  2:45 ` Stephen Rothwell
2011-11-28  2:49 Stephen Rothwell
2011-11-16  0:30 Stephen Rothwell
2011-11-16 10:16 ` Alan Cox
2011-11-16 16:42   ` Jesse Barnes
2011-11-25  1:49 ` Stephen Rothwell
2011-11-25 10:30   ` Alan Cox
2011-11-25 10:34     ` Dave Airlie
2011-11-28  2:53       ` Stephen Rothwell
2011-11-28 11:30         ` Alan Cox
2011-11-28 13:13           ` Stephen Rothwell
2011-11-28 13:18             ` Alan Cox
2011-11-28 13:53               ` Stephen Rothwell
2011-11-28 14:05                 ` Dave Airlie
2011-11-28 14:08                 ` Alan Cox
2011-11-28  2:52     ` Stephen Rothwell
2011-11-28  5:07       ` Greg KH
2011-11-28 11:33       ` Alan Cox
2011-03-15  3:49 Stephen Rothwell
2010-04-08  3:12 Stephen Rothwell
2010-04-08  3:52 ` Dave Airlie
2010-04-08  4:14   ` Stephen Rothwell
2010-04-08 16:19     ` Tony Luck
2010-04-08 20:50       ` Pauli Nieminen

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git