Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/i915/intel_drv.h:32:0,
from drivers/gpu/drm/i915/intel_display.c:36:
drivers/gpu/drm/i915/intel_display.c: In function 'intel_primary_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no
member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15077:6: note: in expansion of macro
'INTEL_GEN'
if (INTEL_GEN(dev) >= 9) {
^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no
member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15081:13: note: in expansion of macro
'INTEL_GEN'
} else if (INTEL_GEN(dev) >= 4) {
^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no
member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15088:6: note: in expansion of macro
'INTEL_GEN'
if (INTEL_GEN(dev) >= 4)
^
drivers/gpu/drm/i915/intel_display.c: In function 'intel_cursor_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no
member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15231:6: note: in expansion of macro
'INTEL_GEN'
if (INTEL_GEN(dev) >= 4)
^
Caused by commit
93ca7e006670 ("drm/i915: Use the per-plane rotation property")
interacting with commit
55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv")
from the drm-intel tree.
I added this merge fix patch:
