git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_modes.c
diff --git
a/drivers/gpu/drm/i915/intel_modes.c
b/drivers/gpu/drm/i915/intel_modes.c
index d1928e79d9b6786de31af6b67cce9ec9962b99a3..d67ec3a51e429cac9eace0a417cb70461ebead2a 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_modes.c
+++ b/
drivers/gpu/drm/i915/intel_modes.c
@@
-56,7
+56,8
@@
bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
}
};
- return i2c_transfer(&dev_priv->gmbus[ddc_bus].adapter, msgs, 2) == 2;
+ return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
+ msgs, 2) == 2;
}
/**