linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the drm-intel tree
@ 2014-04-03  1:24 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2014-04-03  1:24 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel, Dave Airlie; +Cc: linux-next, linux-kernel


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

Hi all,

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

drivers/gpu/drm/i915/intel_display.c: In function 'intel_alloc_plane_obj':
drivers/gpu/drm/i915/intel_display.c:2089:27: error: 'struct drm_crtc' has no member named 'fb'
   obj->stride = crtc->base.fb->pitches[0];
                           ^
drivers/gpu/drm/i915/intel_display.c:2092:36: error: 'struct drm_crtc' has no member named 'fb'
  mode_cmd.pixel_format = crtc->base.fb->pixel_format;
                                    ^
drivers/gpu/drm/i915/intel_display.c:2093:29: error: 'struct drm_crtc' has no member named 'fb'
  mode_cmd.width = crtc->base.fb->width;
                             ^
drivers/gpu/drm/i915/intel_display.c:2094:30: error: 'struct drm_crtc' has no member named 'fb'
  mode_cmd.height = crtc->base.fb->height;
                              ^
drivers/gpu/drm/i915/intel_display.c:2095:34: error: 'struct drm_crtc' has no member named 'fb'
  mode_cmd.pitches[0] = crtc->base.fb->pitches[0];
                                  ^
In file included from arch/x86/include/asm/percpu.h:44:0,
                 from arch/x86/include/asm/preempt.h:5,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_display.c:28:
drivers/gpu/drm/i915/intel_display.c:2099:65: error: 'struct drm_crtc' has no member named 'fb'
  if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.fb),
                                                                 ^
include/linux/kernel.h:833:49: note: in definition of macro 'container_of'
  const typeof( ((type *)0)->member ) *__mptr = (ptr); \
                                                 ^
drivers/gpu/drm/i915/intel_display.c:2099:34: note: in expansion of macro 'to_intel_framebuffer'
  if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.fb),
                                  ^
drivers/gpu/drm/i915/intel_display.c: In function 'intel_find_plane_obj':
drivers/gpu/drm/i915/intel_display.c:2124:23: error: 'struct drm_crtc' has no member named 'fb'
  if (!intel_crtc->base.fb)
                       ^
drivers/gpu/drm/i915/intel_display.c:2130:24: error: 'struct drm_crtc' has no member named 'fb'
  kfree(intel_crtc->base.fb);
                        ^
drivers/gpu/drm/i915/intel_display.c:2131:18: error: 'struct drm_crtc' has no member named 'fb'
  intel_crtc->base.fb = NULL;
                  ^
drivers/gpu/drm/i915/intel_display.c:2143:23: error: 'struct drm_crtc' has no member named 'fb'
   if (!i->active || !c->fb)
                       ^
In file included from arch/x86/include/asm/percpu.h:44:0,
                 from arch/x86/include/asm/preempt.h:5,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_display.c:28:
drivers/gpu/drm/i915/intel_display.c:2146:30: error: 'struct drm_crtc' has no member named 'fb'
   fb = to_intel_framebuffer(c->fb);
                              ^
include/linux/kernel.h:833:49: note: in definition of macro 'container_of'
  const typeof( ((type *)0)->member ) *__mptr = (ptr); \
                                                 ^
drivers/gpu/drm/i915/intel_display.c:2146:8: note: in expansion of macro 'to_intel_framebuffer'
   fb = to_intel_framebuffer(c->fb);
        ^
drivers/gpu/drm/i915/intel_display.c:2148:31: error: 'struct drm_crtc' has no member named 'fb'
    drm_framebuffer_reference(c->fb);
                               ^
drivers/gpu/drm/i915/intel_display.c:2149:20: error: 'struct drm_crtc' has no member named 'fb'
    intel_crtc->base.fb = c->fb;
                    ^
drivers/gpu/drm/i915/intel_display.c:2149:27: error: 'struct drm_crtc' has no member named 'fb'
    intel_crtc->base.fb = c->fb;
                           ^
drivers/gpu/drm/i915/intel_display.c: In function 'i9xx_get_plane_config':
drivers/gpu/drm/i915/intel_display.c:5745:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
            ^
drivers/gpu/drm/i915/intel_display.c:5746:17: error: 'struct drm_crtc' has no member named 'fb'
  if (!crtc->base.fb) {
                 ^
drivers/gpu/drm/i915/intel_display.c:5759:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->pixel_format = fourcc;
            ^
drivers/gpu/drm/i915/intel_display.c:5760:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->bits_per_pixel =
            ^
drivers/gpu/drm/i915/intel_display.c:5775:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->width = ((val >> 16) & 0xfff) + 1;
            ^
drivers/gpu/drm/i915/intel_display.c:5776:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->height = ((val >> 0) & 0xfff) + 1;
            ^
drivers/gpu/drm/i915/intel_display.c:5779:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->pitches[0] = val & 0xffffff80;
            ^
drivers/gpu/drm/i915/intel_display.c:5781:53: error: 'struct drm_crtc' has no member named 'fb'
  aligned_height = intel_align_height(dev, crtc->base.fb->height,
                                                     ^
In file included from include/linux/cache.h:4:0,
                 from include/linux/time.h:4,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_display.c:28:
drivers/gpu/drm/i915/intel_display.c:5784:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:41: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                         ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:5784:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
drivers/gpu/drm/i915/intel_display.c:5784:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:47: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                               ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:5784:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
drivers/gpu/drm/i915/intel_display.c:5784:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:58: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                                          ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:5784:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
In file included from drivers/gpu/drm/i915/intel_display.c:35:0:
drivers/gpu/drm/i915/intel_display.c:5788:32: error: 'struct drm_crtc' has no member named 'fb'
         pipe, plane, crtc->base.fb->width,
                                ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:5789:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->height,
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:5790:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->bits_per_pixel, base,
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:5791:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->pitches[0],
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c: In function 'ironlake_get_plane_config':
drivers/gpu/drm/i915/intel_display.c:6753:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
            ^
drivers/gpu/drm/i915/intel_display.c:6754:17: error: 'struct drm_crtc' has no member named 'fb'
  if (!crtc->base.fb) {
                 ^
drivers/gpu/drm/i915/intel_display.c:6767:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->pixel_format = fourcc;
            ^
drivers/gpu/drm/i915/intel_display.c:6768:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->bits_per_pixel =
            ^
drivers/gpu/drm/i915/intel_display.c:6783:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->width = ((val >> 16) & 0xfff) + 1;
            ^
drivers/gpu/drm/i915/intel_display.c:6784:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->height = ((val >> 0) & 0xfff) + 1;
            ^
drivers/gpu/drm/i915/intel_display.c:6787:12: error: 'struct drm_crtc' has no member named 'fb'
  crtc->base.fb->pitches[0] = val & 0xffffff80;
            ^
drivers/gpu/drm/i915/intel_display.c:6789:53: error: 'struct drm_crtc' has no member named 'fb'
  aligned_height = intel_align_height(dev, crtc->base.fb->height,
                                                     ^
In file included from include/linux/cache.h:4:0,
                 from include/linux/time.h:4,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_display.c:28:
drivers/gpu/drm/i915/intel_display.c:6792:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:41: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                         ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:6792:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
drivers/gpu/drm/i915/intel_display.c:6792:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:47: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                               ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:6792:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
drivers/gpu/drm/i915/intel_display.c:6792:39: error: 'struct drm_crtc' has no member named 'fb'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                                       ^
include/uapi/linux/kernel.h:10:58: note: in definition of macro '__ALIGN_KERNEL_MASK'
 #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))
                                                          ^
include/linux/kernel.h:49:22: note: in expansion of macro '__ALIGN_KERNEL'
 #define ALIGN(x, a)  __ALIGN_KERNEL((x), (a))
                      ^
drivers/gpu/drm/i915/intel_display.c:6792:23: note: in expansion of macro 'ALIGN'
  plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
                       ^
In file included from drivers/gpu/drm/i915/intel_display.c:35:0:
drivers/gpu/drm/i915/intel_display.c:6796:32: error: 'struct drm_crtc' has no member named 'fb'
         pipe, plane, crtc->base.fb->width,
                                ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:6797:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->height,
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:6798:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->bits_per_pixel, base,
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c:6799:19: error: 'struct drm_crtc' has no member named 'fb'
         crtc->base.fb->pitches[0],
                   ^
include/drm/drmP.h:222:41: note: in definition of macro 'DRM_DEBUG_KMS'
    drm_ut_debug_printk(__func__, fmt, ##args); \
                                         ^
drivers/gpu/drm/i915/intel_display.c: In function 'intel_modeset_gem_init':
drivers/gpu/drm/i915/intel_display.c:11783:9: error: 'struct drm_crtc' has no member named 'fb'
   if (!c->fb)
         ^
In file included from arch/x86/include/asm/percpu.h:44:0,
                 from arch/x86/include/asm/preempt.h:5,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_display.c:28:
drivers/gpu/drm/i915/intel_display.c:11786:30: error: 'struct drm_crtc' has no member named 'fb'
   fb = to_intel_framebuffer(c->fb);
                              ^
include/linux/kernel.h:833:49: note: in definition of macro 'container_of'
  const typeof( ((type *)0)->member ) *__mptr = (ptr); \
                                                 ^
drivers/gpu/drm/i915/intel_display.c:11786:8: note: in expansion of macro 'to_intel_framebuffer'
   fb = to_intel_framebuffer(c->fb);
        ^
drivers/gpu/drm/i915/intel_display.c:11790:33: error: 'struct drm_crtc' has no member named 'fb'
    drm_framebuffer_unreference(c->fb);
                                 ^
drivers/gpu/drm/i915/intel_display.c:11791:5: error: 'struct drm_crtc' has no member named 'fb'
    c->fb = NULL;
     ^
drivers/gpu/drm/i915/intel_fbdev.c: In function 'intel_fbdev_init_bios':
drivers/gpu/drm/i915/intel_fbdev.c:484:35: error: 'struct drm_crtc' has no member named 'fb'
   if (!intel_crtc->active || !crtc->fb) {
                                   ^
In file included from arch/x86/include/asm/percpu.h:44:0,
                 from arch/x86/include/asm/preempt.h:5,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_fbdev.c:27:
drivers/gpu/drm/i915/intel_fbdev.c:494:34: error: 'struct drm_crtc' has no member named 'fb'
    fb = to_intel_framebuffer(crtc->fb);
                                  ^
include/linux/kernel.h:833:49: note: in definition of macro 'container_of'
  const typeof( ((type *)0)->member ) *__mptr = (ptr); \
                                                 ^
drivers/gpu/drm/i915/intel_fbdev.c:494:9: note: in expansion of macro 'to_intel_framebuffer'
    fb = to_intel_framebuffer(crtc->fb);
         ^
In file included from arch/x86/include/asm/bug.h:38:0,
                 from include/linux/bug.h:4,
                 from include/linux/thread_info.h:11,
                 from arch/x86/include/asm/preempt.h:6,
                 from include/linux/preempt.h:18,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:35,
                 from include/linux/time.h:5,
                 from include/linux/stat.h:18,
                 from include/linux/module.h:10,
                 from drivers/gpu/drm/i915/intel_fbdev.c:27:
drivers/gpu/drm/i915/intel_fbdev.c:563:13: error: 'struct drm_crtc' has no member named 'fb'
   WARN(!crtc->fb,
             ^
include/asm-generic/bug.h:95:25: note: in definition of macro 'WARN'
  int __ret_warn_on = !!(condition);    \
                         ^

Caused by commit f4510a2752b7 ("drm: Replace crtc fb with primary plane
fb (v3)") from the drm tree interacting with various commits in the
drm-intel tree.

I applied this merge fix patch:

From 8b74d715803f3c8e0e76b907d8877e1355d29a31 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Apr 2014 12:18:47 +1100
Subject: [PATCH] drm: fix for "Replace crtc fb with primary plane fb"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_display.c | 90 ++++++++++++++++++------------------
 drivers/gpu/drm/i915/intel_fbdev.c   |  6 +--
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9eb4dda2d81d..dae976f51d83 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -741,7 +741,7 @@ bool intel_crtc_active(struct drm_crtc *crtc)
 	 * We can ditch the adjusted_mode.crtc_clock check as soon
 	 * as Haswell has gained clock readout/fastboot support.
 	 *
-	 * We can ditch the crtc->fb check as soon as we can
+	 * We can ditch the crtc->primary->fb check as soon as we can
 	 * properly reconstruct framebuffers.
 	 */
 	return intel_crtc->active && crtc->primary->fb &&
@@ -2086,17 +2086,17 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc,
 
 	if (plane_config->tiled) {
 		obj->tiling_mode = I915_TILING_X;
-		obj->stride = crtc->base.fb->pitches[0];
+		obj->stride = crtc->base.primary->fb->pitches[0];
 	}
 
-	mode_cmd.pixel_format = crtc->base.fb->pixel_format;
-	mode_cmd.width = crtc->base.fb->width;
-	mode_cmd.height = crtc->base.fb->height;
-	mode_cmd.pitches[0] = crtc->base.fb->pitches[0];
+	mode_cmd.pixel_format = crtc->base.primary->fb->pixel_format;
+	mode_cmd.width = crtc->base.primary->fb->width;
+	mode_cmd.height = crtc->base.primary->fb->height;
+	mode_cmd.pitches[0] = crtc->base.primary->fb->pitches[0];
 
 	mutex_lock(&dev->struct_mutex);
 
-	if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.fb),
+	if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.primary->fb),
 				   &mode_cmd, obj)) {
 		DRM_DEBUG_KMS("intel fb init failed\n");
 		goto out_unref_obj;
@@ -2121,14 +2121,14 @@ static void intel_find_plane_obj(struct intel_crtc *intel_crtc,
 	struct intel_crtc *i;
 	struct intel_framebuffer *fb;
 
-	if (!intel_crtc->base.fb)
+	if (!intel_crtc->base.primary->fb)
 		return;
 
 	if (intel_alloc_plane_obj(intel_crtc, plane_config))
 		return;
 
-	kfree(intel_crtc->base.fb);
-	intel_crtc->base.fb = NULL;
+	kfree(intel_crtc->base.primary->fb);
+	intel_crtc->base.primary->fb = NULL;
 
 	/*
 	 * Failed to alloc the obj, check to see if we should share
@@ -2140,13 +2140,13 @@ static void intel_find_plane_obj(struct intel_crtc *intel_crtc,
 		if (c == &intel_crtc->base)
 			continue;
 
-		if (!i->active || !c->fb)
+		if (!i->active || !c->primary->fb)
 			continue;
 
-		fb = to_intel_framebuffer(c->fb);
+		fb = to_intel_framebuffer(c->primary->fb);
 		if (i915_gem_obj_ggtt_offset(fb->obj) == plane_config->base) {
-			drm_framebuffer_reference(c->fb);
-			intel_crtc->base.fb = c->fb;
+			drm_framebuffer_reference(c->primary->fb);
+			intel_crtc->base.primary->fb = c->primary->fb;
 			break;
 		}
 	}
@@ -2396,7 +2396,7 @@ void intel_display_handle_reset(struct drm_device *dev)
 		/*
 		 * FIXME: Once we have proper support for primary planes (and
 		 * disabling them without disabling the entire crtc) allow again
-		 * a NULL crtc->fb.
+		 * a NULL crtc->primary->fb.
 		 */
 		if (intel_crtc->active && crtc->primary->fb)
 			dev_priv->display.update_primary_plane(crtc,
@@ -5742,8 +5742,8 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
 	int fourcc, pixel_format;
 	int aligned_height;
 
-	crtc->base.fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
-	if (!crtc->base.fb) {
+	crtc->base.primary->fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
+	if (!crtc->base.primary->fb) {
 		DRM_DEBUG_KMS("failed to alloc fb\n");
 		return;
 	}
@@ -5756,8 +5756,8 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
 
 	pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
 	fourcc = intel_format_to_fourcc(pixel_format);
-	crtc->base.fb->pixel_format = fourcc;
-	crtc->base.fb->bits_per_pixel =
+	crtc->base.primary->fb->pixel_format = fourcc;
+	crtc->base.primary->fb->bits_per_pixel =
 		drm_format_plane_cpp(fourcc, 0) * 8;
 
 	if (INTEL_INFO(dev)->gen >= 4) {
@@ -5772,23 +5772,23 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
 	plane_config->base = base;
 
 	val = I915_READ(PIPESRC(pipe));
-	crtc->base.fb->width = ((val >> 16) & 0xfff) + 1;
-	crtc->base.fb->height = ((val >> 0) & 0xfff) + 1;
+	crtc->base.primary->fb->width = ((val >> 16) & 0xfff) + 1;
+	crtc->base.primary->fb->height = ((val >> 0) & 0xfff) + 1;
 
 	val = I915_READ(DSPSTRIDE(pipe));
-	crtc->base.fb->pitches[0] = val & 0xffffff80;
+	crtc->base.primary->fb->pitches[0] = val & 0xffffff80;
 
-	aligned_height = intel_align_height(dev, crtc->base.fb->height,
+	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
 					    plane_config->tiled);
 
-	plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
+	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
 				   aligned_height, PAGE_SIZE);
 
 	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
-		      pipe, plane, crtc->base.fb->width,
-		      crtc->base.fb->height,
-		      crtc->base.fb->bits_per_pixel, base,
-		      crtc->base.fb->pitches[0],
+		      pipe, plane, crtc->base.primary->fb->width,
+		      crtc->base.primary->fb->height,
+		      crtc->base.primary->fb->bits_per_pixel, base,
+		      crtc->base.primary->fb->pitches[0],
 		      plane_config->size);
 
 }
@@ -6750,8 +6750,8 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
 	int fourcc, pixel_format;
 	int aligned_height;
 
-	crtc->base.fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
-	if (!crtc->base.fb) {
+	crtc->base.primary->fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL);
+	if (!crtc->base.primary->fb) {
 		DRM_DEBUG_KMS("failed to alloc fb\n");
 		return;
 	}
@@ -6764,8 +6764,8 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
 
 	pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
 	fourcc = intel_format_to_fourcc(pixel_format);
-	crtc->base.fb->pixel_format = fourcc;
-	crtc->base.fb->bits_per_pixel =
+	crtc->base.primary->fb->pixel_format = fourcc;
+	crtc->base.primary->fb->bits_per_pixel =
 		drm_format_plane_cpp(fourcc, 0) * 8;
 
 	base = I915_READ(DSPSURF(plane)) & 0xfffff000;
@@ -6780,23 +6780,23 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
 	plane_config->base = base;
 
 	val = I915_READ(PIPESRC(pipe));
-	crtc->base.fb->width = ((val >> 16) & 0xfff) + 1;
-	crtc->base.fb->height = ((val >> 0) & 0xfff) + 1;
+	crtc->base.primary->fb->width = ((val >> 16) & 0xfff) + 1;
+	crtc->base.primary->fb->height = ((val >> 0) & 0xfff) + 1;
 
 	val = I915_READ(DSPSTRIDE(pipe));
-	crtc->base.fb->pitches[0] = val & 0xffffff80;
+	crtc->base.primary->fb->pitches[0] = val & 0xffffff80;
 
-	aligned_height = intel_align_height(dev, crtc->base.fb->height,
+	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
 					    plane_config->tiled);
 
-	plane_config->size = ALIGN(crtc->base.fb->pitches[0] *
+	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
 				   aligned_height, PAGE_SIZE);
 
 	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
-		      pipe, plane, crtc->base.fb->width,
-		      crtc->base.fb->height,
-		      crtc->base.fb->bits_per_pixel, base,
-		      crtc->base.fb->pitches[0],
+		      pipe, plane, crtc->base.primary->fb->width,
+		      crtc->base.primary->fb->height,
+		      crtc->base.primary->fb->bits_per_pixel, base,
+		      crtc->base.primary->fb->pitches[0],
 		      plane_config->size);
 }
 
@@ -11780,15 +11780,15 @@ void intel_modeset_gem_init(struct drm_device *dev)
 	 */
 	mutex_lock(&dev->struct_mutex);
 	list_for_each_entry(c, &dev->mode_config.crtc_list, head) {
-		if (!c->fb)
+		if (!c->primary->fb)
 			continue;
 
-		fb = to_intel_framebuffer(c->fb);
+		fb = to_intel_framebuffer(c->primary->fb);
 		if (intel_pin_and_fence_fb_obj(dev, fb->obj, NULL)) {
 			DRM_ERROR("failed to pin boot fb on pipe %d\n",
 				  to_intel_crtc(c)->pipe);
-			drm_framebuffer_unreference(c->fb);
-			c->fb = NULL;
+			drm_framebuffer_unreference(c->primary->fb);
+			c->primary->fb = NULL;
 		}
 	}
 	mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index d6d78c86c232..2b1d42dbfe13 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -481,7 +481,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		intel_crtc = to_intel_crtc(crtc);
 
-		if (!intel_crtc->active || !crtc->fb) {
+		if (!intel_crtc->active || !crtc->primary->fb) {
 			DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
 				      pipe_name(intel_crtc->pipe));
 			continue;
@@ -491,7 +491,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
 			DRM_DEBUG_KMS("found possible fb from plane %c\n",
 				      pipe_name(intel_crtc->pipe));
 			plane_config = &intel_crtc->plane_config;
-			fb = to_intel_framebuffer(crtc->fb);
+			fb = to_intel_framebuffer(crtc->primary->fb);
 			max_size = plane_config->size;
 		}
 	}
@@ -560,7 +560,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
 		if (!intel_crtc->active)
 			continue;
 
-		WARN(!crtc->fb,
+		WARN(!crtc->primary->fb,
 		     "re-used BIOS config but lost an fb on crtc %d\n",
 		     crtc->base.id);
 	}
-- 
1.9.1

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

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

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

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2024-06-27 21:48   ` Dave Airlie
@ 2024-06-28  9:29     ` Jani Nikula
  0 siblings, 0 replies; 35+ messages in thread
From: Jani Nikula @ 2024-06-28  9:29 UTC (permalink / raw)
  To: Dave Airlie, Rodrigo Vivi
  Cc: Stephen Rothwell, Daniel Vetter, Joonas Lahtinen, Mitul Golani,
	Suraj Kandpal, Intel Graphics, DRI, Linux Kernel Mailing List,
	Linux Next Mailing List

On Fri, 28 Jun 2024, Dave Airlie <airlied@gmail.com> wrote:
> On Tue, 18 Jun 2024 at 05:26, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>>
>> On Wed, Jun 12, 2024 at 02:12:39PM +1000, Stephen Rothwell wrote:
>> > Hi all,
>> >
>> > After merging the drm-intel tree, today's linux-next build (i386
>> > defconfig) failed like this:
>> >
>> > x86_64-linux-gnu-ld: drivers/gpu/drm/i915/display/intel_vrr.o: in function `intel_vrr_compute_config':
>> > intel_vrr.c:(.text+0x4e4): undefined reference to `__udivdi3'
>> >
>> > Caused by commit
>> >
>> >   1676ecd303ac ("drm/i915: Compute CMRR and calculate vtotal")
>> >
>> > I have reverted that commit for today.
>>
>> the fixes for that is available in drm-intel-next now. you should probably
>> remove the revert.
>>
>> Thanks for the heads up on that.
>
> In file included from
> /home/airlied/devel/kernel/dim/src/arch/arm/include/asm/div64.h:107,
>                  from /home/airlied/devel/kernel/dim/src/include/linux/math.h:6,
>                  from
> /home/airlied/devel/kernel/dim/src/include/linux/kernel.h:27,
>                  from
> /home/airlied/devel/kernel/dim/src/include/linux/cpumask.h:11,
>                  from /home/airlied/devel/kernel/dim/src/include/linux/smp.h:13,
>                  from
> /home/airlied/devel/kernel/dim/src/include/linux/lockdep.h:14,
>                  from
> /home/airlied/devel/kernel/dim/src/include/linux/spinlock.h:63,
>                  from
> /home/airlied/devel/kernel/dim/src/include/linux/kref.h:16,
>                  from
> /home/airlied/devel/kernel/dim/src/include/drm/drm_device.h:5,
>                  from
> /home/airlied/devel/kernel/dim/src/include/drm/drm_drv.h:35,
>                  from
> /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h:13,
>                  from
> /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:7:
> /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:
> In function ‘cmrr_get_vtotal’:
> /home/airlied/devel/kernel/dim/src/include/asm-generic/div64.h:222:35:
> warning: comparison of distinct pointer types lacks a cast
>   222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
>       |                                   ^~
> /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:155:35:
> note: in expansion of macro ‘do_div’
>   155 |         crtc_state->cmrr.cmrr_m = do_div(adjusted_pixel_rate,
> crtc_state->cmrr.cmrr_n);
>       |                                   ^~~~~~
>
> The fixes might need some more fixing, 32-bit arm build.

Hmm. Works for me with commit 213cc30331e9 ("drm/i915/display: Consider
adjusted_pixel_rate to be u64"). Are you hitting this with drm/next
which doesn't have that yet?

BR,
Jani.


>
> Dave.
>
>>
>> >
>> > --
>> > Cheers,
>> > Stephen Rothwell
>>
>>

-- 
Jani Nikula, Intel

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2024-06-17 19:19 ` Rodrigo Vivi
@ 2024-06-27 21:48   ` Dave Airlie
  2024-06-28  9:29     ` Jani Nikula
  0 siblings, 1 reply; 35+ messages in thread
From: Dave Airlie @ 2024-06-27 21:48 UTC (permalink / raw)
  To: Rodrigo Vivi
  Cc: Stephen Rothwell, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Mitul Golani, Suraj Kandpal, Intel Graphics, DRI,
	Linux Kernel Mailing List, Linux Next Mailing List

On Tue, 18 Jun 2024 at 05:26, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>
> On Wed, Jun 12, 2024 at 02:12:39PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-intel tree, today's linux-next build (i386
> > defconfig) failed like this:
> >
> > x86_64-linux-gnu-ld: drivers/gpu/drm/i915/display/intel_vrr.o: in function `intel_vrr_compute_config':
> > intel_vrr.c:(.text+0x4e4): undefined reference to `__udivdi3'
> >
> > Caused by commit
> >
> >   1676ecd303ac ("drm/i915: Compute CMRR and calculate vtotal")
> >
> > I have reverted that commit for today.
>
> the fixes for that is available in drm-intel-next now. you should probably
> remove the revert.
>
> Thanks for the heads up on that.

In file included from
/home/airlied/devel/kernel/dim/src/arch/arm/include/asm/div64.h:107,
                 from /home/airlied/devel/kernel/dim/src/include/linux/math.h:6,
                 from
/home/airlied/devel/kernel/dim/src/include/linux/kernel.h:27,
                 from
/home/airlied/devel/kernel/dim/src/include/linux/cpumask.h:11,
                 from /home/airlied/devel/kernel/dim/src/include/linux/smp.h:13,
                 from
/home/airlied/devel/kernel/dim/src/include/linux/lockdep.h:14,
                 from
/home/airlied/devel/kernel/dim/src/include/linux/spinlock.h:63,
                 from
/home/airlied/devel/kernel/dim/src/include/linux/kref.h:16,
                 from
/home/airlied/devel/kernel/dim/src/include/drm/drm_device.h:5,
                 from
/home/airlied/devel/kernel/dim/src/include/drm/drm_drv.h:35,
                 from
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h:13,
                 from
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:7:
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:
In function ‘cmrr_get_vtotal’:
/home/airlied/devel/kernel/dim/src/include/asm-generic/div64.h:222:35:
warning: comparison of distinct pointer types lacks a cast
  222 |         (void)(((typeof((n)) *)0) == ((uint64_t *)0));  \
      |                                   ^~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/i915/display/intel_vrr.c:155:35:
note: in expansion of macro ‘do_div’
  155 |         crtc_state->cmrr.cmrr_m = do_div(adjusted_pixel_rate,
crtc_state->cmrr.cmrr_n);
      |                                   ^~~~~~

The fixes might need some more fixing, 32-bit arm build.

Dave.

>
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
>

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2024-06-12  4:12 Stephen Rothwell
@ 2024-06-17 19:19 ` Rodrigo Vivi
  2024-06-27 21:48   ` Dave Airlie
  0 siblings, 1 reply; 35+ messages in thread
From: Rodrigo Vivi @ 2024-06-17 19:19 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Mitul Golani,
	Suraj Kandpal, Intel Graphics, DRI, Linux Kernel Mailing List,
	Linux Next Mailing List

On Wed, Jun 12, 2024 at 02:12:39PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-intel tree, today's linux-next build (i386
> defconfig) failed like this:
> 
> x86_64-linux-gnu-ld: drivers/gpu/drm/i915/display/intel_vrr.o: in function `intel_vrr_compute_config':
> intel_vrr.c:(.text+0x4e4): undefined reference to `__udivdi3'
> 
> Caused by commit
> 
>   1676ecd303ac ("drm/i915: Compute CMRR and calculate vtotal")
> 
> I have reverted that commit for today.

the fixes for that is available in drm-intel-next now. you should probably
remove the revert.

Thanks for the heads up on that.

> 
> -- 
> Cheers,
> Stephen Rothwell



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

* linux-next: build failure after merge of the drm-intel tree
@ 2024-06-12  4:12 Stephen Rothwell
  2024-06-17 19:19 ` Rodrigo Vivi
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2024-06-12  4:12 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi
  Cc: Mitul Golani, Suraj Kandpal, Intel Graphics, DRI,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the drm-intel tree, today's linux-next build (i386
defconfig) failed like this:

x86_64-linux-gnu-ld: drivers/gpu/drm/i915/display/intel_vrr.o: in function `intel_vrr_compute_config':
intel_vrr.c:(.text+0x4e4): undefined reference to `__udivdi3'

Caused by commit

  1676ecd303ac ("drm/i915: Compute CMRR and calculate vtotal")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2022-08-26  2:36 Stephen Rothwell
@ 2022-08-26  7:50 ` Jani Nikula
  0 siblings, 0 replies; 35+ messages in thread
From: Jani Nikula @ 2022-08-26  7:50 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Joonas Lahtinen, Rodrigo Vivi,
	Dave Airlie
  Cc: Intel Graphics, DRI, John Harrison, Linux Kernel Mailing List,
	Linux Next Mailing List

On Fri, 26 Aug 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function 'intel_guc_dump_time_info':
> drivers/gpu/drm/i915/gt/uc/intel_guc.c:399:9: error: implicit declaration of function 'intel_device_info_print_runtime'; did you mean 'intel_device_info_print'? [-Werror=implicit-function-declaration]
>   399 |         intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |         intel_device_info_print
>
> Caused by commit
>
>   c7d3c8447b26 ("drm/i915: combine device info printing into one")
>
> interacting with commit
>
>   368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information")
>
> from the drm tree.

There's commit f0c70d41e4e8 ("drm/i915/guc: remove runtime info printing
from time stamp logging") in drm-intel-gt-next removing that line
altogether.

BR,
Jani.

>
> I have applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 26 Aug 2022 12:30:19 +1000
> Subject: [PATCH] fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information"
>
> interacting with "drm/i915: combine device info printing into one".
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index ab4aacc516aa..977278d71182 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -396,7 +396,7 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)
>  	u32 stamp = 0;
>  	u64 ktime;
>  
> -	intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
> +	intel_device_info_print(INTEL_INFO(gt->i915), RUNTIME_INFO(gt->i915), p);
>  
>  	with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
>  		stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);
> -- 
> 2.35.1

-- 
Jani Nikula, Intel Open Source Graphics Center

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

* linux-next: build failure after merge of the drm-intel tree
@ 2022-08-26  2:36 Stephen Rothwell
  2022-08-26  7:50 ` Jani Nikula
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2022-08-26  2:36 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Dave Airlie
  Cc: Intel Graphics, DRI, John Harrison, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function 'intel_guc_dump_time_info':
drivers/gpu/drm/i915/gt/uc/intel_guc.c:399:9: error: implicit declaration of function 'intel_device_info_print_runtime'; did you mean 'intel_device_info_print'? [-Werror=implicit-function-declaration]
  399 |         intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |         intel_device_info_print

Caused by commit

  c7d3c8447b26 ("drm/i915: combine device info printing into one")

interacting with commit

  368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information")

from the drm tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Aug 2022 12:30:19 +1000
Subject: [PATCH] fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information"

interacting with "drm/i915: combine device info printing into one".

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

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index ab4aacc516aa..977278d71182 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -396,7 +396,7 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)
 	u32 stamp = 0;
 	u64 ktime;
 
-	intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
+	intel_device_info_print(INTEL_INFO(gt->i915), RUNTIME_INFO(gt->i915), p);
 
 	with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
 		stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2022-04-26  2:08 Stephen Rothwell
@ 2022-04-26  7:36 ` Jani Nikula
  0 siblings, 0 replies; 35+ messages in thread
From: Jani Nikula @ 2022-04-26  7:36 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Christoph Hellwig, Zhi Wang, Linux Kernel Mailing List,
	Linux Next Mailing List

On Tue, 26 Apr 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: modpost: "intel_runtime_pm_put" [drivers/gpu/drm/i915/kvmgt.ko] undefined!
>
> Possibly caused by commit
>
>   8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")
>
> or one of tehe follow ups.
>
> I have used the drm-intel tree from next-20220422 for today.

Details at [1], fix at [2].

BR,
Jani.

[1] https://lore.kernel.org/r/87ilqxuyu3.fsf@intel.com
[2] https://lore.kernel.org/r/20220425220331.24865-1-zhi.a.wang@intel.com


-- 
Jani Nikula, Intel Open Source Graphics Center

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

* linux-next: build failure after merge of the drm-intel tree
@ 2022-04-26  2:08 Stephen Rothwell
  2022-04-26  7:36 ` Jani Nikula
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2022-04-26  2:08 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Christoph Hellwig, Zhi Wang, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

ERROR: modpost: "intel_runtime_pm_put" [drivers/gpu/drm/i915/kvmgt.ko] undefined!

Possibly caused by commit

  8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")

or one of tehe follow ups.

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

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2022-02-15  1:10 Stephen Rothwell
@ 2022-02-15 12:11 ` Jani Nikula
  0 siblings, 0 replies; 35+ messages in thread
From: Jani Nikula @ 2022-02-15 12:11 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie

On Tue, 15 Feb 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'handle_edid_regs':
> drivers/gpu/drm/i915/gvt/kvmgt.c:595:38: error: implicit declaration of function 'drm_edid_block_valid' [-Werror=implicit-function-declaration]
>   595 |                                 if (!drm_edid_block_valid(
>       |                                      ^~~~~~~~~~~~~~~~~~~~
>
> Presumably caused by commit
>
>   14da21cc4671 ("drm/i915: axe lots of unnecessary includes from i915_drv.h")
>
> I am beginning to wonder if you guys run stuff through your CI before
> relasing to linux-next.  Especially important when removing #include
> statements from include files :-)

Thanks for the report. Apparently CI (and I) have VFIO=n, VFIO_MDEV=n,
and DRM_I915_GVT_KVMGT=n.

BR,
Jani.


>
> I have used the drm-intel tree from next-20220214 for today.

-- 
Jani Nikula, Intel Open Source Graphics Center

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

* linux-next: build failure after merge of the drm-intel tree
@ 2022-02-15  1:10 Stephen Rothwell
  2022-02-15 12:11 ` Jani Nikula
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2022-02-15  1:10 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie

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

Hi all,

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

drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'handle_edid_regs':
drivers/gpu/drm/i915/gvt/kvmgt.c:595:38: error: implicit declaration of function 'drm_edid_block_valid' [-Werror=implicit-function-declaration]
  595 |                                 if (!drm_edid_block_valid(
      |                                      ^~~~~~~~~~~~~~~~~~~~

Presumably caused by commit

  14da21cc4671 ("drm/i915: axe lots of unnecessary includes from i915_drv.h")

I am beginning to wonder if you guys run stuff through your CI before
relasing to linux-next.  Especially important when removing #include
statements from include files :-)

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

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-intel tree
@ 2021-05-21  1:58 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2021-05-21  1:58 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Anusha Srivatsa, Lucas De Marchi, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/i915/gvt/handlers.c: In function 'init_skl_mmio_info':
drivers/gpu/drm/i915/gvt/handlers.c:3345:9: error: 'CSR_SSP_BASE' undeclared (first use in this function); did you mean 'DMC_SSP_BASE'?
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:2: note: in expansion of macro 'MMIO_D'
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:9: note: each undeclared identifier is reported only once for each function it appears in
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:2: note: in expansion of macro 'MMIO_D'
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3346:9: error: 'CSR_HTP_SKL' undeclared (first use in this function); did you mean 'DMC_HTP_SKL'?
 3346 |  MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
      |         ^~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3346:2: note: in expansion of macro 'MMIO_D'
 3346 |  MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3347:9: error: 'CSR_LAST_WRITE' undeclared (first use in this function); did you mean 'DMC_LAST_WRITE'?
 3347 |  MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3347:2: note: in expansion of macro 'MMIO_D'
 3347 |  MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
      |  ^~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:64,
                 from drivers/gpu/drm/i915/gvt/handlers.c:39:
drivers/gpu/drm/i915/gvt/handlers.c: At top level:
drivers/gpu/drm/i915/gvt/handlers.c:3658:21: error: 'CSR_MMIO_START_RANGE' undeclared here (not in a function); did you mean 'DMC_MMIO_START_RANGE'?
 3658 |  {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
      |                     ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/i915_reg.h:185:47: note: in definition of macro '_MMIO'
  185 | #define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
      |                                               ^

Caused by commit

  0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")

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

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2021-01-19 23:57 Stephen Rothwell
@ 2021-01-21  1:11 ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2021-01-21  1:11 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Lyude Paul, Jani Nikula, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

On Wed, 20 Jan 2021 10:57:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-intel tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/msm/dp/dp_ctrl.c: In function 'dp_ctrl_use_fixed_nvid':
> drivers/gpu/drm/msm/dp/dp_ctrl.c:1425:16: error: implicit declaration of function 'drm_dp_get_edid_quirks'; did you mean 'drm_do_get_edid'? [-Werror=implicit-function-declaration]
>  1425 |  edid_quirks = drm_dp_get_edid_quirks(ctrl->panel->edid);
>       |                ^~~~~~~~~~~~~~~~~~~~~~
>       |                drm_do_get_edid
> drivers/gpu/drm/msm/dp/dp_ctrl.c:1431:11: error: too many arguments to function 'drm_dp_has_quirk'
>  1431 |   return (drm_dp_has_quirk(&ctrl->panel->desc, edid_quirks,
>       |           ^~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/msm/dp/dp_ctrl.c:15:
> include/drm/drm_dp_helper.h:2087:1: note: declared here
>  2087 | drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
>       | ^~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")
> 
> Since the drm-intel tree still has its other build failure, I used the
> version from next-20210108 again today.

I still get this failure, but not the one from the drm tree, so I have
used the drm-intel tree from next-20210119 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-intel tree
@ 2021-01-19 23:57 Stephen Rothwell
  2021-01-21  1:11 ` Stephen Rothwell
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2021-01-19 23:57 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Lyude Paul, Jani Nikula, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/msm/dp/dp_ctrl.c: In function 'dp_ctrl_use_fixed_nvid':
drivers/gpu/drm/msm/dp/dp_ctrl.c:1425:16: error: implicit declaration of function 'drm_dp_get_edid_quirks'; did you mean 'drm_do_get_edid'? [-Werror=implicit-function-declaration]
 1425 |  edid_quirks = drm_dp_get_edid_quirks(ctrl->panel->edid);
      |                ^~~~~~~~~~~~~~~~~~~~~~
      |                drm_do_get_edid
drivers/gpu/drm/msm/dp/dp_ctrl.c:1431:11: error: too many arguments to function 'drm_dp_has_quirk'
 1431 |   return (drm_dp_has_quirk(&ctrl->panel->desc, edid_quirks,
      |           ^~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/dp/dp_ctrl.c:15:
include/drm/drm_dp_helper.h:2087:1: note: declared here
 2087 | drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
      | ^~~~~~~~~~~~~~~~

Caused by commit

  7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")

Since the drm-intel tree still has its other build failure, I used the
version from next-20210108 again today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
       [not found] ` <20191210094224.4a294cb7@canb.auug.org.au>
@ 2019-12-11  9:31   ` Jani Nikula
  0 siblings, 0 replies; 35+ messages in thread
From: Jani Nikula @ 2019-12-11  9:31 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, S,
	Maarten Lankhorst, Qian Cai, Ingo Molnar, Dave Airlie

On Tue, 10 Dec 2019, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> [Just adding Dave Airlie to the cc list]
>
> On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the drm-intel tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:

FYI, I've now backmerged drm-next and thus v5.5-rc1 to
drm-intel-next-queued, resolving the conflict.

BR,
Jani.


>> 
>> In file included from include/linux/spinlock_types.h:18,
>>                  from include/linux/mutex.h:16,
>>                  from include/linux/kernfs.h:12,
>>                  from include/linux/sysfs.h:16,
>>                  from include/linux/kobject.h:20,
>>                  from include/linux/of.h:17,
>>                  from include/linux/irqdomain.h:35,
>>                  from include/linux/acpi.h:13,
>>                  from drivers/gpu/drm/i915/i915_drv.c:30:
>> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
>> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>>       |  ^~~~~~~~~~~~
>> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>>       |  ^~~~~~~~~~~~~~~~~
>> include/linux/lockdep.h:352:13: note: declared here
>>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>>       |             ^~~~~~~~~~~~
>> In file included from include/linux/spinlock_types.h:18,
>>                  from include/linux/spinlock.h:83,
>>                  from include/linux/mmzone.h:8,
>>                  from include/linux/gfp.h:6,
>>                  from include/linux/slab.h:15,
>>                  from drivers/gpu/drm/i915/i915_irq.c:32:
>> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
>> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>>       |  ^~~~~~~~~~~~
>> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>>       |  ^~~~~~~~~~~~~~~~~
>> include/linux/lockdep.h:352:13: note: declared here
>>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>>       |             ^~~~~~~~~~~~
>> 
>> Caused by commit
>> 
>>   e692b4021a2e ("lockdep: add might_lock_nested()")
>> 
>> interacting with commit
>> 
>>   5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")
>> 
>> from Linus' tree.
>> 
>> I have applied the following merge fix patch for today:
>> 
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 10 Dec 2019 09:37:07 +1100
>> Subject: [PATCH] lockdep: fix up for lock_release API change
>> 
>> ---
>>  include/linux/lockdep.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
>> index 5bbfd5866081..664f52c6dd4c 100644
>> --- a/include/linux/lockdep.h
>> +++ b/include/linux/lockdep.h
>> @@ -632,7 +632,7 @@ do {									\
>>  	typecheck(struct lockdep_map *, &(lock)->dep_map);		\
>>  	lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL,		\
>>  		     _THIS_IP_);					\
>> -	lock_release(&(lock)->dep_map, 0, _THIS_IP_);		\
>> +	lock_release(&(lock)->dep_map, _THIS_IP_);			\
>>  } while (0)
>>  
>>  #define lockdep_assert_irqs_enabled()	do {				\

-- 
Jani Nikula, Intel Open Source Graphics Center

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2019-03-27 11:07 ` Joonas Lahtinen
@ 2019-03-27 11:31   ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2019-03-27 11:31 UTC (permalink / raw)
  To: Joonas Lahtinen
  Cc: Paulo Zanoni, Daniele Ceraolo Spurio, Daniel Vetter,
	Intel Graphics, Linux Kernel Mailing List,
	Linux Next Mailing List, DRI, Rodrigo Vivi


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

Hi Joonas,

On Wed, 27 Mar 2019 13:07:40 +0200 Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Stephen Rothwell (2019-03-27 04:59:04)
> > 
> > After merging the drm-intel tree, today's linux-next build (i386
> > defconfig) failed like this:  
> 
> We had a CI reporting mishap, where a failed 32-bit build resulted in
> a misleading success e-mail being sent.

It happens.

> The tree is now fixed and we'll investigate the problem to avoid such
> a false report in the future.

Thanks.

-- 
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] 35+ messages in thread

* Re: linux-next: build failure after merge of the drm-intel tree
  2019-03-27  2:59 Stephen Rothwell
@ 2019-03-27 11:07 ` Joonas Lahtinen
  2019-03-27 11:31   ` Stephen Rothwell
  0 siblings, 1 reply; 35+ messages in thread
From: Joonas Lahtinen @ 2019-03-27 11:07 UTC (permalink / raw)
  To: DRI, Daniel Vetter, Intel Graphics, Jani Nikula, Rodrigo Vivi,
	Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Paulo Zanoni

Quoting Stephen Rothwell (2019-03-27 04:59:04)
> Hi all,
> 
> After merging the drm-intel tree, today's linux-next build (i386
> defconfig) failed like this:

We had a CI reporting mishap, where a failed 32-bit build resulted in
a misleading success e-mail being sent.

The tree is now fixed and we'll investigate the problem to avoid such
a false report in the future.

Regards, Joonas

> 
> In file included from drivers/gpu/drm/i915/intel_guc.h:28:0,
>                  from drivers/gpu/drm/i915/intel_uc.h:27,
>                  from drivers/gpu/drm/i915/intel_uc.c:25:
> drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_read64':
> drivers/gpu/drm/i915/intel_uncore.h:257:9: error: implicit declaration of function 'readq'; did you mean 'readl'? [-Werror=implicit-function-declaration]
>   return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \
>          ^
> drivers/gpu/drm/i915/intel_uncore.h:269:1: note: in expansion of macro '__raw_read'
>  __raw_read(64, q)
>  ^~~~~~~~~~
> drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_write64':
> drivers/gpu/drm/i915/intel_uncore.h:264:2: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration]
>   write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \
>   ^
> drivers/gpu/drm/i915/intel_uncore.h:274:1: note: in expansion of macro '__raw_write'
>  __raw_write(64, q)
>  ^~~~~~~~~~~
> 
> Caused by commit
> 
>   6cc5ca768825 ("drm/i915: rename raw reg access functions")
> 
> I have reverted that commit and the following ones in the tree up to
> 
>   9511cb6481af ("drm/i915: Adding missing '; ' to ENGINE_INSTANCES")
> 
> -- 
> Cheers,
> Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: build failure after merge of the drm-intel tree
@ 2019-03-27  2:59 Stephen Rothwell
  2019-03-27 11:07 ` Joonas Lahtinen
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2019-03-27  2:59 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Daniele Ceraolo Spurio, Linux Next Mailing List,
	Linux Kernel Mailing List, Paulo Zanoni


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

Hi all,

After merging the drm-intel tree, today's linux-next build (i386
defconfig) failed like this:

In file included from drivers/gpu/drm/i915/intel_guc.h:28:0,
                 from drivers/gpu/drm/i915/intel_uc.h:27,
                 from drivers/gpu/drm/i915/intel_uc.c:25:
drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_read64':
drivers/gpu/drm/i915/intel_uncore.h:257:9: error: implicit declaration of function 'readq'; did you mean 'readl'? [-Werror=implicit-function-declaration]
  return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \
         ^
drivers/gpu/drm/i915/intel_uncore.h:269:1: note: in expansion of macro '__raw_read'
 __raw_read(64, q)
 ^~~~~~~~~~
drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_write64':
drivers/gpu/drm/i915/intel_uncore.h:264:2: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration]
  write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \
  ^
drivers/gpu/drm/i915/intel_uncore.h:274:1: note: in expansion of macro '__raw_write'
 __raw_write(64, q)
 ^~~~~~~~~~~

Caused by commit

  6cc5ca768825 ("drm/i915: rename raw reg access functions")

I have reverted that commit and the following ones in the tree up to

  9511cb6481af ("drm/i915: Adding missing '; ' to ENGINE_INSTANCES")

-- 
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] 35+ messages in thread

* Re: linux-next: build failure after merge of the drm-intel tree
  2018-07-13  1:54 Stephen Rothwell
@ 2018-07-23  2:29 ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2018-07-23  2:29 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI, Linux-Next Mailing List,
	Linux Kernel Mailing List, Changbin Du, Zhenyu Wang

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

Hi all,

On Fri, 13 Jul 2018 11:54:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> [Dave cc'd because this will probably turn up in the drm tree soon.]

And now it has ...

> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'gvt_dma_map_page':
> drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared (first use in this function); did you mean 'gfn'?
>   if (!pfn_valid(pfn)) {
>                  ^~~
> 
> Caused by commit
> 
>   79e542f5af79 ("drm/i915/kvmgt: Support setting dma map for huge pages")
> 
> interacting with commit
> 
>   39b4cbadb9a9 ("drm/i915/kvmgt: Check the pfn got from vfio_pin_pages")
> 
> from Linus' tree (v4.18-rc1).
> 
> I added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 13 Jul 2018 11:48:41 +1000
> Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from
>  vfio_pin_pages"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 718ab307a500..4d2f53ae9f0f 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -185,12 +185,6 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
>  	if (ret)
>  		return ret;
>  
> -	if (!pfn_valid(pfn)) {
> -		gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn);
> -		vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1);
> -		return -EINVAL;
> -	}
> -
>  	/* Setup DMA mapping. */
>  	*dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
>  	ret = dma_mapping_error(dev, *dma_addr);

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the drm-intel tree
@ 2018-07-13  1:54 Stephen Rothwell
  2018-07-23  2:29 ` Stephen Rothwell
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2018-07-13  1:54 UTC (permalink / raw)
  To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
	Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Changbin Du,
	Zhenyu Wang, Dave Airlie

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

Hi all,

[Dave cc'd because this will probably turn up in the drm tree soon.]

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

drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'gvt_dma_map_page':
drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared (first use in this function); did you mean 'gfn'?
  if (!pfn_valid(pfn)) {
                 ^~~

Caused by commit

  79e542f5af79 ("drm/i915/kvmgt: Support setting dma map for huge pages")

interacting with commit

  39b4cbadb9a9 ("drm/i915/kvmgt: Check the pfn got from vfio_pin_pages")

from Linus' tree (v4.18-rc1).

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Jul 2018 11:48:41 +1000
Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from
 vfio_pin_pages"

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

diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 718ab307a500..4d2f53ae9f0f 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -185,12 +185,6 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
 	if (ret)
 		return ret;
 
-	if (!pfn_valid(pfn)) {
-		gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn);
-		vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1);
-		return -EINVAL;
-	}
-
 	/* Setup DMA mapping. */
 	*dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
 	ret = dma_mapping_error(dev, *dma_addr);
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-09  5:08   ` Christoph Hellwig
@ 2018-05-09  5:18     ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2018-05-09  5:18 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Dave Airlie, Daniel Vetter, Intel Graphics, DRI,
	Linux-Next Mailing List, Linux Kernel Mailing List, Nipun Gupta,
	Bjorn Helgaas, Rob Herring

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

Hi Christoph,

On Wed, 9 May 2018 07:08:55 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> FYI, because the dma_configure change touch so much code and the author
> wants to base more work on it it actually is in a guranteed stable
> branch with just those patches:
> 
>     git://git.infradead.org/users/hch/dma-mapping.git dma-configure
> 
> Gitweb:
> 
>     http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure
>   
> Feel free to pull this into the drm tree.

Thanks for that.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-09  5:02 ` Stephen Rothwell
@ 2018-05-09  5:08   ` Christoph Hellwig
  2018-05-09  5:18     ` Stephen Rothwell
  0 siblings, 1 reply; 35+ messages in thread
From: Christoph Hellwig @ 2018-05-09  5:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Dave Airlie, Daniel Vetter, Intel Graphics,
	DRI, Linux-Next Mailing List, Linux Kernel Mailing List,
	Nipun Gupta, Bjorn Helgaas, Rob Herring

On Wed, May 09, 2018 at 03:02:55PM +1000, Stephen Rothwell wrote:
> > -	ret = of_dma_configure(dev, NULL);
> > +	ret = of_dma_configure(dev, NULL, true);
> >  	if (ret < 0) {
> >  		DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
> >  		return ret;
> > -- 
> > 2.17.0
> 
> This is now needed for the merge of the drm and dma-mapping trees.

FYI, because the dma_configure change touch so much code and the author
wants to base more work on it it actually is in a guranteed stable
branch with just those patches:

    git://git.infradead.org/users/hch/dma-mapping.git dma-configure

Gitweb:

    http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure
  
Feel free to pull this into the drm tree.

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:07 Stephen Rothwell
  2018-05-08  7:08 ` Oleksandr Andrushchenko
@ 2018-05-09  5:02 ` Stephen Rothwell
  2018-05-09  5:08   ` Christoph Hellwig
  1 sibling, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2018-05-09  5:02 UTC (permalink / raw)
  To: Christoph Hellwig, Dave Airlie
  Cc: Rob Herring, Daniel Vetter, Intel Graphics,
	Linux Kernel Mailing List, DRI, Linux-Next Mailing List,
	Nipun Gupta, Bjorn Helgaas


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

Hi all,

On Tue, 8 May 2018 11:07:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe':
> drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma'
>   dev->bus->force_dma = true;
>           ^~
> drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure'
>   ret = of_dma_configure(dev, NULL);
>         ^~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0:
> include/linux/of_device.h:58:5: note: declared here
>  int of_dma_configure(struct device *dev,
>      ^~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend")
> 
> interacting with commit
> 
>   3d6ce86ee794 ("drivers: remove force dma flag from buses")
> 
> from the dma-mapping tree.
> 
> I have added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 May 2018 11:02:24 +1000
> Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/xen/xen_drm_front.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
> index 1b0ea9ac330e..0e486cb1c10c 100644
> --- a/drivers/gpu/drm/xen/xen_drm_front.c
> +++ b/drivers/gpu/drm/xen/xen_drm_front.c
> @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
>  	 * is not correct: to fix this call of_dma_configure() with a NULL
>  	 * node to set default DMA ops.
>  	 */
> -	dev->bus->force_dma = true;
>  	dev->coherent_dma_mask = DMA_BIT_MASK(32);
> -	ret = of_dma_configure(dev, NULL);
> +	ret = of_dma_configure(dev, NULL, true);
>  	if (ret < 0) {
>  		DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
>  		return ret;
> -- 
> 2.17.0

This is now needed for the merge of the drm and dma-mapping trees.
-- 
Cheers,
Stephen Rothwell

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

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2018-05-08  1:07 Stephen Rothwell
@ 2018-05-08  7:08 ` Oleksandr Andrushchenko
  2018-05-09  5:02 ` Stephen Rothwell
  1 sibling, 0 replies; 35+ messages in thread
From: Oleksandr Andrushchenko @ 2018-05-08  7:08 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI, Christoph Hellwig
  Cc: Dave Airlie, Bjorn Helgaas, Linux-Next Mailing List,
	Linux Kernel Mailing List, Nipun Gupta

On 05/08/2018 04:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe':
> drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma'
>    dev->bus->force_dma = true;
>            ^~
> drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure'
>    ret = of_dma_configure(dev, NULL);
>          ^~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0:
> include/linux/of_device.h:58:5: note: declared here
>   int of_dma_configure(struct device *dev,
>       ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
>    c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend")
>
> interacting with commit
>
>    3d6ce86ee794 ("drivers: remove force dma flag from buses")
>
> from the dma-mapping tree.
>
> I have added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 May 2018 11:02:24 +1000
> Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thank you,
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> ---
>   drivers/gpu/drm/xen/xen_drm_front.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
> index 1b0ea9ac330e..0e486cb1c10c 100644
> --- a/drivers/gpu/drm/xen/xen_drm_front.c
> +++ b/drivers/gpu/drm/xen/xen_drm_front.c
> @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
>   	 * is not correct: to fix this call of_dma_configure() with a NULL
>   	 * node to set default DMA ops.
>   	 */
> -	dev->bus->force_dma = true;
>   	dev->coherent_dma_mask = DMA_BIT_MASK(32);
> -	ret = of_dma_configure(dev, NULL);
> +	ret = of_dma_configure(dev, NULL, true);
>   	if (ret < 0) {
>   		DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
>   		return ret;
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: build failure after merge of the drm-intel tree
@ 2018-05-08  1:07 Stephen Rothwell
  2018-05-08  7:08 ` Oleksandr Andrushchenko
  2018-05-09  5:02 ` Stephen Rothwell
  0 siblings, 2 replies; 35+ messages in thread
From: Stephen Rothwell @ 2018-05-08  1:07 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI, Christoph Hellwig
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Nipun Gupta,
	Bjorn Helgaas, Rob Herring, Dave Airlie

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

Hi all,

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

drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe':
drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma'
  dev->bus->force_dma = true;
          ^~
drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure'
  ret = of_dma_configure(dev, NULL);
        ^~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0:
include/linux/of_device.h:58:5: note: declared here
 int of_dma_configure(struct device *dev,
     ^~~~~~~~~~~~~~~~

Caused by commit

  c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend")

interacting with commit

  3d6ce86ee794 ("drivers: remove force dma flag from buses")

from the dma-mapping tree.

I have added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 May 2018 11:02:24 +1000
Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses"

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

diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
index 1b0ea9ac330e..0e486cb1c10c 100644
--- a/drivers/gpu/drm/xen/xen_drm_front.c
+++ b/drivers/gpu/drm/xen/xen_drm_front.c
@@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
 	 * is not correct: to fix this call of_dma_configure() with a NULL
 	 * node to set default DMA ops.
 	 */
-	dev->bus->force_dma = true;
 	dev->coherent_dma_mask = DMA_BIT_MASK(32);
-	ret = of_dma_configure(dev, NULL);
+	ret = of_dma_configure(dev, NULL, true);
 	if (ret < 0) {
 		DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
 		return ret;
-- 
2.17.0

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2016-08-23  1:56 Stephen Rothwell
@ 2016-08-23 16:33 ` Daniel Vetter
  0 siblings, 0 replies; 35+ messages in thread
From: Daniel Vetter @ 2016-08-23 16:33 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Daniel Vetter, Intel Graphics, Joonas Lahtinen, linux-kernel,
	DRI, linux-next

On Tue, Aug 23, 2016 at 11:56:14AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-intel tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from drivers/gpio/gpiolib-of.c:19:0:
> include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory
> In file included from drivers/gpu/drm/nouveau/include/nvif/os.h:16:0,
>                  from drivers/gpu/drm/nouveau/include/nvkm/core/os.h:3,
>                  from drivers/gpu/drm/nouveau/include/nvkm/core/object.h:3,   
>                  from drivers/gpu/drm/nouveau/include/nvkm/core/client.h:3,   
>                  from drivers/gpu/drm/nouveau/nvkm/core/client.c:24:
> include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory
> 
> and many more.
> 
> Caused by commit
> 
>   cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping")
> 
> I have used the drm-intel tree from next-20160822 for today.

Should be fixed now, thanks for reporting.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: build failure after merge of the drm-intel tree
@ 2016-08-23  1:56 Stephen Rothwell
  2016-08-23 16:33 ` Daniel Vetter
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2016-08-23  1:56 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Joonas Lahtinen, linux-next, linux-kernel

Hi all,

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

In file included from drivers/gpio/gpiolib-of.c:19:0:
include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory
In file included from drivers/gpu/drm/nouveau/include/nvif/os.h:16:0,
                 from drivers/gpu/drm/nouveau/include/nvkm/core/os.h:3,
                 from drivers/gpu/drm/nouveau/include/nvkm/core/object.h:3,   
                 from drivers/gpu/drm/nouveau/include/nvkm/core/client.h:3,   
                 from drivers/gpu/drm/nouveau/nvkm/core/client.c:24:
include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory

and many more.

Caused by commit

  cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping")

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

-- 
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] 35+ messages in thread

* linux-next: build failure after merge of the drm-intel tree
@ 2016-05-23  2:24 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2016-05-23  2:24 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel

Hi all,

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

In file included from drivers/gpu/drm/i915/i915_trace.h:10:0,
                 from drivers/gpu/drm/i915/i915_drv.h:2735,
                 from drivers/gpu/drm/i915/i915_drv.c:34:
drivers/gpu/drm/i915/intel_drv.h:36:41: fatal error: drm/drm_dp_dual_mode_helper.h: No such file or directory

Caused by commit

  8d87410a019f ("drm/i915: Respect DP++ adaptor TMDS clock limit")

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

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2014-03-19  0:53 Stephen Rothwell
@ 2014-03-19  1:18 ` Steven Rostedt
  0 siblings, 0 replies; 35+ messages in thread
From: Steven Rostedt @ 2014-03-19  1:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Daniel Vetter, intel-gfx, linux-next, linux-kernel, dri-devel

On Wed, 19 Mar 2014 11:53:50 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:


> Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers
> from ring buffer in evict event").
> 
> I have used the drm-intel tree from next-20140318 for today.
> 

Bah! I'm still suffering from jet lag (just came back from Linux-Tage
in Chemnitz).

The next time I compile test a patch for a module, I'll make sure I have
that module's config option set :-(  The woe of using localmodconfig. I
should have picked the box with the i915. :-/

Below is the fix. I'll repost a v2 of the original patch.

Sorry about that.

-- Steve

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index f3e8a90..783ae08 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -243,7 +243,7 @@ TRACE_EVENT(i915_gem_evict_vm,
 			    ),
 
 	    TP_fast_assign(
-			   __entry->dev = dev->primary->index;
+			   __entry->dev = vm->dev->primary->index;
 			   __entry->vm = vm;
 			  ),

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

* linux-next: build failure after merge of the drm-intel tree
@ 2014-03-19  0:53 Stephen Rothwell
  2014-03-19  1:18 ` Steven Rostedt
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2014-03-19  0:53 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Steven Rostedt

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

Hi all,

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

In file included from include/trace/define_trace.h:90:0,
                 from drivers/gpu/drm/i915/i915_trace.h:520,
                 from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'ftrace_raw_event_i915_gem_evict_vm':
drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function)
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^
drivers/gpu/drm/i915/./i915_trace.h:246:22: note: each undeclared identifier is reported only once for each function it appears in
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^
In file included from include/trace/define_trace.h:90:0,
                 from drivers/gpu/drm/i915/i915_trace.h:520,
                 from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_evict_vm':
drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function)
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:708:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^

Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers
from ring buffer in evict event").

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

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

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2013-02-19  2:01     ` Stephen Rothwell
@ 2013-02-19 10:28       ` Daniel Vetter
  0 siblings, 0 replies; 35+ messages in thread
From: Daniel Vetter @ 2013-02-19 10:28 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jesse Barnes, intel-gfx, dri-devel, linux-next, linux-kernel

On Tue, Feb 19, 2013 at 3:01 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>>
>> On Fri, 15 Feb 2013 10:30:16 +0100
>> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>
>> > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > >
>> > > After merging the drm-intel tree, today's linux-next build (x86_64
>> > > allmodconfig) failed like this:
>> > >
>> > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined!
>> > >
>> > > I have dropped the tree for today.
>> >
>> > Meh, that fail was already reported from Wu's kernel builder a few
>> > days ago, but no patch yet showed up to fix things. Since the i915
>> > side of that work isn't ready yet either I've dropped the offending
>> > patches.
>>
>> I sent a patch yesterday for this.  I'll bounce it over again.
>
> I am still getting that build failure.

Ok, should be really fixed now, my apologies for the mess.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2013-02-15 16:16   ` Jesse Barnes
@ 2013-02-19  2:01     ` Stephen Rothwell
  2013-02-19 10:28       ` Daniel Vetter
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2013-02-19  2:01 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Jesse Barnes, intel-gfx, dri-devel, linux-next, linux-kernel

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

Hi Daniel,

On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> On Fri, 15 Feb 2013 10:30:16 +0100
> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> 
> > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the drm-intel tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined!
> > >
> > > I have dropped the tree for today.
> > 
> > Meh, that fail was already reported from Wu's kernel builder a few
> > days ago, but no patch yet showed up to fix things. Since the i915
> > side of that work isn't ready yet either I've dropped the offending
> > patches.
> 
> I sent a patch yesterday for this.  I'll bounce it over again.

I am still getting that build failure.

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

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

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2013-02-15  9:30 ` Daniel Vetter
@ 2013-02-15 16:16   ` Jesse Barnes
  2013-02-19  2:01     ` Stephen Rothwell
  0 siblings, 1 reply; 35+ messages in thread
From: Jesse Barnes @ 2013-02-15 16:16 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Stephen Rothwell, intel-gfx, dri-devel, linux-next, linux-kernel

On Fri, 15 Feb 2013 10:30:16 +0100
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > After merging the drm-intel tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined!
> >
> > I have dropped the tree for today.
> 
> Meh, that fail was already reported from Wu's kernel builder a few
> days ago, but no patch yet showed up to fix things. Since the i915
> side of that work isn't ready yet either I've dropped the offending
> patches.

I sent a patch yesterday for this.  I'll bounce it over again.

-- 
Jesse Barnes, Intel Open Source Technology Center

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

* Re: linux-next: build failure after merge of the drm-intel tree
  2013-02-15  2:37 Stephen Rothwell
@ 2013-02-15  9:30 ` Daniel Vetter
  2013-02-15 16:16   ` Jesse Barnes
  0 siblings, 1 reply; 35+ messages in thread
From: Daniel Vetter @ 2013-02-15  9:30 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: intel-gfx, linux-next, linux-kernel, dri-devel

On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined!
>
> I have dropped the tree for today.

Meh, that fail was already reported from Wu's kernel builder a few
days ago, but no patch yet showed up to fix things. Since the i915
side of that work isn't ready yet either I've dropped the offending
patches.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

* linux-next: build failure after merge of the drm-intel tree
@ 2013-02-15  2:37 Stephen Rothwell
  2013-02-15  9:30 ` Daniel Vetter
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2013-02-15  2:37 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel

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

Hi all,

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

ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined!

I have dropped the tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

end of thread, other threads:[~2024-06-28  9:29 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-03  1:24 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-06-12  4:12 Stephen Rothwell
2024-06-17 19:19 ` Rodrigo Vivi
2024-06-27 21:48   ` Dave Airlie
2024-06-28  9:29     ` Jani Nikula
2022-08-26  2:36 Stephen Rothwell
2022-08-26  7:50 ` Jani Nikula
2022-04-26  2:08 Stephen Rothwell
2022-04-26  7:36 ` Jani Nikula
2022-02-15  1:10 Stephen Rothwell
2022-02-15 12:11 ` Jani Nikula
2021-05-21  1:58 Stephen Rothwell
2021-01-19 23:57 Stephen Rothwell
2021-01-21  1:11 ` Stephen Rothwell
     [not found] <20191210093957.5120f717@canb.auug.org.au>
     [not found] ` <20191210094224.4a294cb7@canb.auug.org.au>
2019-12-11  9:31   ` Jani Nikula
2019-03-27  2:59 Stephen Rothwell
2019-03-27 11:07 ` Joonas Lahtinen
2019-03-27 11:31   ` Stephen Rothwell
2018-07-13  1:54 Stephen Rothwell
2018-07-23  2:29 ` Stephen Rothwell
2018-05-08  1:07 Stephen Rothwell
2018-05-08  7:08 ` Oleksandr Andrushchenko
2018-05-09  5:02 ` Stephen Rothwell
2018-05-09  5:08   ` Christoph Hellwig
2018-05-09  5:18     ` Stephen Rothwell
2016-08-23  1:56 Stephen Rothwell
2016-08-23 16:33 ` Daniel Vetter
2016-05-23  2:24 Stephen Rothwell
2014-03-19  0:53 Stephen Rothwell
2014-03-19  1:18 ` Steven Rostedt
2013-02-15  2:37 Stephen Rothwell
2013-02-15  9:30 ` Daniel Vetter
2013-02-15 16:16   ` Jesse Barnes
2013-02-19  2:01     ` Stephen Rothwell
2013-02-19 10:28       ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).