diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-25 14:11:14 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-25 15:27:32 -0400 |
| commit | 21d40d37eca86872f2bf0af995809ebdef25c9d9 (patch) | |
| tree | b9626f936392f223fa7d001de38213a177bfe7fd /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 5e64499f3d39c633de49320e399479642c2b1743 (diff) | |
drm/i915: Rename intel_output to intel_encoder.
The intel_output naming is inherited from the UMS code, which had a
structure of screen -> CRTC -> output. The DRM code has an additional
notion of encoder/connector, so the structure is screen -> CRTC ->
encoder -> connector. This is a useful structure for SDVO encoders
which can support multiple connectors (each of which requires
different programming in the one encoder and could be connected to
different CRTCs), or for DVI-I, where multiple encoders feed into the
connector for whether it's used for digital or analog. Most of our
code is encoder-related, so transition it to talking about encoders
before we start trying to distinguish connectors.
This patch is produced by sed s/intel_output/intel_encoder/ over the
driver.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index bfbdad92d73d..5b53adfad40a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -259,10 +259,10 @@ static void i915_hotplug_work_func(struct work_struct *work) | |||
| 259 | 259 | ||
| 260 | if (mode_config->num_connector) { | 260 | if (mode_config->num_connector) { |
| 261 | list_for_each_entry(connector, &mode_config->connector_list, head) { | 261 | list_for_each_entry(connector, &mode_config->connector_list, head) { |
| 262 | struct intel_output *intel_output = to_intel_output(connector); | 262 | struct intel_encoder *intel_encoder = to_intel_encoder(connector); |
| 263 | 263 | ||
| 264 | if (intel_output->hot_plug) | 264 | if (intel_encoder->hot_plug) |
| 265 | (*intel_output->hot_plug) (intel_output); | 265 | (*intel_encoder->hot_plug) (intel_encoder); |
| 266 | } | 266 | } |
| 267 | } | 267 | } |
| 268 | /* Just fire off a uevent and let userspace tell us what to do */ | 268 | /* Just fire off a uevent and let userspace tell us what to do */ |
