diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-06 09:59:52 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 09:59:57 +0000 |
| commit | cee5ec43460351f0ce4617d3ffb34b74ad613a00 (patch) | |
| tree | 1c3fddcf3e7fbf086e857884113a748d9b9d17e7 /drivers/gpu/drm/gma500/gem.c | |
| parent | 04b3924db60f974d2b4af0b2e19a0ae7ca202dc7 (diff) | |
| parent | 1b22edfd6efd02b6cb9cfe3389ed54731abb3a45 (diff) | |
drm: Merge branch 'drm-gma500-alancox' into drm-core-next
This merges a topic branch containing patches from Alan for the GMA500 driver.
* drm-gma500-alancox:
gma500: Oaktrail BIOS handling
gma500: Fix oaktrail probing part 1
gma500: Be smarter about layout
gma500: gtt based hardware scrolling console
gma500: frame buffer locking
gma500: Fix backlight crash
gma500: kill bogus code
gma500: Convert spaces to tabs in accel_2d.c.
gma500: do a pass over the FIXME tags
gma500: Add VBLANK support for Poulsbo hardware
gma500: Don't enable MSI on Poulsbo
gma500: Only register interrupt handler for poulsbo hardware
gma500: kill virtual mapping support
gma500: Move the API
gma500: kill off NUM_PIPE define
gma500: Rename the ioctls to avoid clashing with the legacy drivers
drm/gma500: begin pruning dead bits of API
Diffstat (limited to 'drivers/gpu/drm/gma500/gem.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/gem.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index 65fdd6b8ab1..9fbb86868e2 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -25,7 +25,7 @@ #include <drm/drmP.h> #include <drm/drm.h> -#include "psb_drm.h" +#include "gma_drm.h" #include "psb_drv.h" int psb_gem_init_object(struct drm_gem_object *obj) @@ -120,8 +120,7 @@ static int psb_gem_create(struct drm_file *file, /* Initialize the extra goodies GEM needs to do all the hard work */ if (drm_gem_object_init(dev, &r->gem, size) != 0) { psb_gtt_free_range(dev, r); - /* GEM doesn't give an error code and we don't have an - EGEMSUCKS so make something up for now - FIXME */ + /* GEM doesn't give an error code so use -ENOMEM */ dev_err(dev->dev, "GEM init failed for %lld\n", size); return -ENOMEM; } @@ -191,8 +190,6 @@ int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev, * The VMA was set up by GEM. In doing so it also ensured that the * vma->vm_private_data points to the GEM object that is backing this * mapping. - * - * FIXME */ int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { @@ -274,13 +271,13 @@ int psb_gem_create_ioctl(struct drm_device *dev, void *data, { struct drm_psb_gem_create *args = data; int ret; - if (args->flags & PSB_GEM_CREATE_STOLEN) { + if (args->flags & GMA_GEM_CREATE_STOLEN) { ret = psb_gem_create_stolen(file, dev, args->size, &args->handle); if (ret == 0) return 0; /* Fall throguh */ - args->flags &= ~PSB_GEM_CREATE_STOLEN; + args->flags &= ~GMA_GEM_CREATE_STOLEN; } return psb_gem_create(file, dev, args->size, &args->handle); } |