aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2009-12-16 15:16:17 -0500
committerEric Anholt <eric@anholt.net>2009-12-16 16:53:02 -0500
commitb295d1b6e3e3f240d27cbe556d33ff5eb54721a7 (patch)
tree09ec44d0977bcf3874b44dfc4eb19f238bce58c4 /drivers/gpu/drm/i915/intel_display.c
parentcfdf1fa23f4074c9f8766dc67a928bbf680b1ac9 (diff)
drm/i915: Track whether cursor needs physical address in intel_device_info
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 52cd9b006da2..ef9c6139ee31 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3385,7 +3385,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
3385 3385
3386 /* we only need to pin inside GTT if cursor is non-phy */ 3386 /* we only need to pin inside GTT if cursor is non-phy */
3387 mutex_lock(&dev->struct_mutex); 3387 mutex_lock(&dev->struct_mutex);
3388 if (!dev_priv->cursor_needs_physical) { 3388 if (!dev_priv->info->cursor_needs_physical) {
3389 ret = i915_gem_object_pin(bo, PAGE_SIZE); 3389 ret = i915_gem_object_pin(bo, PAGE_SIZE);
3390 if (ret) { 3390 if (ret) {
3391 DRM_ERROR("failed to pin cursor bo\n"); 3391 DRM_ERROR("failed to pin cursor bo\n");
@@ -3420,7 +3420,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
3420 I915_WRITE(base, addr); 3420 I915_WRITE(base, addr);
3421 3421
3422 if (intel_crtc->cursor_bo) { 3422 if (intel_crtc->cursor_bo) {
3423 if (dev_priv->cursor_needs_physical) { 3423 if (dev_priv->info->cursor_needs_physical) {
3424 if (intel_crtc->cursor_bo != bo) 3424 if (intel_crtc->cursor_bo != bo)
3425 i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo); 3425 i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo);
3426 } else 3426 } else