git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_irq.c
diff --git
a/drivers/gpu/drm/i915/i915_irq.c
b/drivers/gpu/drm/i915/i915_irq.c
index
49c458b
..
6421481
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_irq.c
+++ b/
drivers/gpu/drm/i915/i915_irq.c
@@
-260,10
+260,10
@@
static void i915_hotplug_work_func(struct work_struct *work)
if (mode_config->num_connector) {
list_for_each_entry(connector, &mode_config->connector_list, head) {
if (mode_config->num_connector) {
list_for_each_entry(connector, &mode_config->connector_list, head) {
- struct intel_
output *intel_output = to_intel_output
(connector);
+ struct intel_
encoder *intel_encoder = to_intel_encoder
(connector);
- if (intel_
output
->hot_plug)
- (*intel_
output->hot_plug) (intel_output
);
+ if (intel_
encoder
->hot_plug)
+ (*intel_
encoder->hot_plug) (intel_encoder
);
}
}
/* Just fire off a uevent and let userspace tell us what to do */
}
}
/* Just fire off a uevent and let userspace tell us what to do */
@@
-444,7
+444,7
@@
i915_error_object_create(struct drm_device *dev,
if (src == NULL)
return NULL;
if (src == NULL)
return NULL;
- src_priv =
src->driver_private
;
+ src_priv =
to_intel_bo(src)
;
if (src_priv->pages == NULL)
return NULL;
if (src_priv->pages == NULL)
return NULL;