[Intel-gfx] linux-next: build failure after merge of the drm-intel tree

[Stephen Rothwell]

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 'render_mmio_to_ring_id':
drivers/gpu/drm/i915/gvt/handlers.c:137:31: error: request for member 'mmio_base' in something not a structure or union
   if (gvt->dev_priv->engine[i].mmio_base == reg)
                               ^
drivers/gpu/drm/i915/gvt/scheduler.c: In function 'populate_shadow_context':
drivers/gpu/drm/i915/gvt/scheduler.c:71:4: error: passing argument 1 of 'intel_lr_context_size' from incompatible pointer type [-Werror=incompatible-pointer-types]
    &gvt->dev_priv->engine[ring_id]);
    ^
In file included from drivers/gpu/drm/i915/i915_drv.h:58:0,
                 from drivers/gpu/drm/i915/gvt/scheduler.c:36:
drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **'
 uint32_t intel_lr_context_size(struct intel_engine_cs *engine);
          ^
drivers/gpu/drm/i915/gvt/scheduler.c: In function 'dispatch_workload':
drivers/gpu/drm/i915/gvt/scheduler.c:174:41: error: passing argument 1 of 'i915_gem_request_alloc' from incompatible pointer type [-Werror=incompatible-pointer-types]
  workload->req = i915_gem_request_alloc(&dev_priv->engine[ring_id],
                                         ^
In file included from drivers/gpu/drm/i915/intel_ringbuffer.h:6:0,
                 from drivers/gpu/drm/i915/intel_guc.h:29,
                 from drivers/gpu/drm/i915/i915_drv.h:57,
                 from drivers/gpu/drm/i915/gvt/scheduler.c:36:
drivers/gpu/drm/i915/i915_gem_request.h:156:1: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **'
 i915_gem_request_alloc(struct intel_engine_cs *engine,
 ^
drivers/gpu/drm/i915/gvt/scheduler.c: In function 'update_guest_context':
drivers/gpu/drm/i915/gvt/scheduler.c:301:4: error: passing argument 1 of 'intel_lr_context_size' from incompatible pointer type [-Werror=incompatible-pointer-types]
    &gvt->dev_priv->engine[ring_id]);
    ^
In file included from drivers/gpu/drm/i915/i915_drv.h:58:0,
                 from drivers/gpu/drm/i915/gvt/scheduler.c:36:
drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **'
 uint32_t intel_lr_context_size(struct intel_engine_cs *engine);
          ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_execlist_status':
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^  
drivers/gpu/drm/i915/gvt/execlist.c:97:19: note: in expansion of macro 'execlist_ring_mmio'
  u32 status_reg = execlist_ring_mmio(vgpu->gvt,
                   ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_csb_update':
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^  
drivers/gpu/drm/i915/gvt/execlist.c:136:23: note: in expansion of macro 'execlist_ring_mmio'
  ctx_status_ptr_reg = execlist_ring_mmio(vgpu->gvt, ring_id,
                       ^
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^  
drivers/gpu/drm/i915/gvt/execlist.c:138:23: note: in expansion of macro 'execlist_ring_mmio'
  ctx_status_buf_reg = execlist_ring_mmio(vgpu->gvt, ring_id,
                       ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'get_next_execlist_slot':
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^  
drivers/gpu/drm/i915/gvt/execlist.c:248:19: note: in expansion of macro 'execlist_ring_mmio'
  u32 status_reg = execlist_ring_mmio(vgpu->gvt, ring_id,
                   ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_shadow_batch_buffer':
drivers/gpu/drm/i915/gvt/execlist.c:501:4: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations]
    drm_gem_object_unreference(&(entry_obj->obj->base));
    ^
In file included from drivers/gpu/drm/i915/gvt/execlist.c:35:0:
drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here
 extern void drm_gem_object_unreference(struct drm_gem_object *);
             ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_shadow_wa_ctx':
drivers/gpu/drm/i915/gvt/execlist.c:514:2: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations]
  drm_gem_object_unreference(&(wa_ctx->indirect_ctx.obj->base));
  ^
In file included from drivers/gpu/drm/i915/gvt/execlist.c:35:0:
drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here
 extern void drm_gem_object_unreference(struct drm_gem_object *);
             ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'init_vgpu_execlist':
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^
drivers/gpu/drm/i915/gvt/execlist.c:248:19: note: in expansi
on of macro 'execlist_ring_mmio'
  u32 status_reg = execlist_ring_mmio(vgpu->gvt, ring_id,
                   ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_sh
adow_batch_buffer':
drivers/gpu/drm/i915/gvt/execlist.c:501:4: warning: 'drm_gem
_object_unreference' is deprecated [-Wdeprecated-declarations]
    drm_gem_object_unreference(&(entry_obj->obj->base));
    ^
In file included from drivers/gpu/drm/i915/gvt/execlist.c:35
:0:
drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here
 extern void drm_gem_object_unreference(struct drm_gem_object *);
             ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_sh
adow_wa_ctx':
drivers/gpu/drm/i915/gvt/execlist.c:514:2: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations]
  drm_gem_object_unreference(&(wa_ctx->indirect_ctx.obj->base));
  ^
In file included from drivers/gpu/drm/i915/gvt/execlist.c:35:0:
drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here
 extern void drm_gem_object_unreference(struct drm_gem_object *);
             ^
drivers/gpu/drm/i915/gvt/execlist.c: In function 'init_vgpu_execlist':
drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union
  (gvt->dev_priv->engine[ring_id].mmio_base + (offset))
                                 ^
drivers/gpu/drm/i915/gvt/execlist.c:798:23: note: in expansion of macro 'execlist_ring_mmio'
  ctx_status_ptr_reg = execlist_ring_mmio(vgpu->gvt, ring_id,
                       ^

Caused by commit

  3b3f1650b1ca ("drm/i915: Allocate intel_engine_cs structure only for the enabled engines")

interacting with some other commits that were merged without fixes being applied (probably) in commit

  06a75ace46e2 ("Merge tag 'gvt-next-2016-10-14' of https://github.com/01org/gvt-linux into drm-intel-next-queued")

I have used the version of the drm-intel tree from next-20161017 for
today.

-- 
Cheers,
Stephen Rothwell