Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from drivers/gpu/drm/i915/intel_opregion.c:34:0:
drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_get_panel_type':
drivers/gpu/drm/i915/intel_opregion.c:1042:17: error: 'dev' undeclared (first use in this function)
if (IS_SKYLAKE(dev)) {
^
drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__'
if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \
^
drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO'
#define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake)
^
drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE'
if (IS_SKYLAKE(dev)) {
^
drivers/gpu/drm/i915/intel_opregion.c:1042:17: note: each undeclared identifier is reported only once for each function it appears in
if (IS_SKYLAKE(dev)) {
^
drivers/gpu/drm/i915/i915_drv.h:2603:43: note: in definition of macro '__I915__'
if (__builtin_types_compatible_p(typeof(*p), struct drm_i915_private)) \
^
drivers/gpu/drm/i915/i915_drv.h:2670:26: note: in expansion of macro 'INTEL_INFO'
#define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake)
^
drivers/gpu/drm/i915/intel_opregion.c:1042:6: note: in expansion of macro 'IS_SKYLAKE'
if (IS_SKYLAKE(dev)) {
^
Caused by commit
6f9f4b7a2cf7 ("drm/i915/opregion: Convert to using native drm_i915_private")
interacting with commit
aeddda06c1a7 ("drm/i915: Ignore panel type from OpRegion on SKL")
from the drm-intel-fixes tree.
I applied this merge fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 15 Jul 2016 13:34:05 +1000
Subject: [PATCH] drm/i915/opregion: fix up for argument change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_opregion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 21f19641e33e..dcdb346b596c 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -1039,7 +1039,7 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
* vswing instead. Low vswing results in some display flickers, so
* let's simply ignore the OpRegion panel type on SKL for now.
*/
- if (IS_SKYLAKE(dev)) {
+ if (IS_SKYLAKE(dev_priv)) {
DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
return -ENODEV;
}
--
2.8.1
--
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
