fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-01-06 16:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i915: update cursor handling to use GEM objects

Browse source
This commit is contained in:
Jesse Barnes 2008-08-13 16:57:42 -07:00
parent 1c6abcefdc
commit 5f9e4a764a
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
linux-core/intel_display.c
View file

@ -982,12 +982,12 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct drm_buffer_object *bo;
struct drm_gem_object *bo;
struct drm_i915_gem_object *obj_priv;
int pipe = intel_crtc->pipe;
uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
uint32_t temp;
int ret;
size_t addr;
DRM_DEBUG("\n");
@ -1010,25 +1010,22 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
return -EINVAL;
}
ret = drm_get_buffer_object(dev, &bo, handle);
if (ret) {
return -EINVAL;
}
bo = drm_gem_object_lookup(dev, file_priv, handle);
if (!bo)
return -ENOENT;
if ((bo->mem.flags & DRM_BO_MASK_MEM) != DRM_BO_FLAG_MEM_VRAM) {
DRM_ERROR("buffer needs to be in VRAM\n");
return -ENOMEM;
}
obj_priv = bo->driver_private;
if (bo->mem.size < width * height * 4) {
if (bo->size < width * height * 4) {
DRM_ERROR("buffer is to small\n");
return -ENOMEM;
}
if (dev_priv->cursor_needs_physical)
addr = dev_priv->stolen_base + bo->offset;
else
addr = bo->offset;
if (dev_priv->cursor_needs_physical) {
addr = dev->agp->base + obj_priv->gtt_offset;
} else {
addr = obj_priv->gtt_offset;
}
intel_crtc->cursor_addr = addr;
temp = 0;