diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-09 10:44:14 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-09 12:00:36 -0400 |
commit | f875c15a4fbf37534dda30771d8bde8604fbbf09 (patch) | |
tree | 6c90c65af1198bf1c9a2120e4480837b59a115be /drivers/gpu/drm/i915/intel_drv.h | |
parent | 4ef69c7a64b78d477d1666eba258ca049e8bac91 (diff) |
drm/i915: Use the direct mapping of pipe->crtc
Why iterate all the crtcs to find the pipe, when we already know which
crtc is attached to which pipe?
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 454bcf3933c..ba94944e4eb 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -177,6 +177,13 @@ struct intel_crtc { | |||
177 | #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) | 177 | #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) |
178 | #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) | 178 | #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) |
179 | 179 | ||
180 | static inline struct drm_crtc * | ||
181 | intel_get_crtc_for_pipe(struct drm_device *dev, int pipe) | ||
182 | { | ||
183 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
184 | return dev_priv->pipe_to_crtc_mapping[pipe]; | ||
185 | } | ||
186 | |||
180 | struct intel_unpin_work { | 187 | struct intel_unpin_work { |
181 | struct work_struct work; | 188 | struct work_struct work; |
182 | struct drm_device *dev; | 189 | struct drm_device *dev; |
@@ -235,7 +242,6 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, | |||
235 | struct drm_file *file_priv); | 242 | struct drm_file *file_priv); |
236 | extern void intel_wait_for_vblank_off(struct drm_device *dev, int pipe); | 243 | extern void intel_wait_for_vblank_off(struct drm_device *dev, int pipe); |
237 | extern void intel_wait_for_vblank(struct drm_device *dev, int pipe); | 244 | extern void intel_wait_for_vblank(struct drm_device *dev, int pipe); |
238 | extern struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe); | ||
239 | extern struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, | 245 | extern struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, |
240 | struct drm_connector *connector, | 246 | struct drm_connector *connector, |
241 | struct drm_display_mode *mode, | 247 | struct drm_display_mode *mode, |