diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2009-12-16 15:16:17 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-16 13:53:02 -0800 |
| commit | b295d1b6e3e3f240d27cbe556d33ff5eb54721a7 (patch) | |
| tree | 09ec44d0977bcf3874b44dfc4eb19f238bce58c4 /drivers/gpu/drm/i915/intel_display.c | |
| parent | cfdf1fa23f4074c9f8766dc67a928bbf680b1ac9 (diff) | |
| download | lwn-b295d1b6e3e3f240d27cbe556d33ff5eb54721a7.tar.gz lwn-b295d1b6e3e3f240d27cbe556d33ff5eb54721a7.zip | |
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.c | 4 |
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, /* we only need to pin inside GTT if cursor is non-phy */ mutex_lock(&dev->struct_mutex); - if (!dev_priv->cursor_needs_physical) { + if (!dev_priv->info->cursor_needs_physical) { ret = i915_gem_object_pin(bo, PAGE_SIZE); if (ret) { DRM_ERROR("failed to pin cursor bo\n"); @@ -3420,7 +3420,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, I915_WRITE(base, addr); if (intel_crtc->cursor_bo) { - if (dev_priv->cursor_needs_physical) { + if (dev_priv->info->cursor_needs_physical) { if (intel_crtc->cursor_bo != bo) i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo); } else |