diff options
| author | Alan Cox <alan@linux.jf.intel.com> | 2011-05-09 16:04:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 11:16:46 -0700 |
| commit | f92e88343e713c65f6edef4ed7883ba37a8ccbfd (patch) | |
| tree | a7f2deb9338eb1167f25e100a074a491207cbd85 | |
| parent | ea1ce3762b0ed9647d002dad8f3745c2ae534d0a (diff) | |
| download | kernel_samsung_smdk4412-f92e88343e713c65f6edef4ed7883ba37a8ccbfd.zip kernel_samsung_smdk4412-f92e88343e713c65f6edef4ed7883ba37a8ccbfd.tar.gz kernel_samsung_smdk4412-f92e88343e713c65f6edef4ed7883ba37a8ccbfd.tar.bz2 | |
gma500: Fix dumb create crash
The error path from gtt_alloc returns NULL not a ptr error. The underlying
fail is caused by a bug in the size calculation. With these two fixed it
passes kmstest, although it's not really doing anything useful yet.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/gma500/psb_gem.c | 6 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_gtt.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/gma500/psb_gem.c b/drivers/staging/gma500/psb_gem.c index d47c187..518f8c1 100644 --- a/drivers/staging/gma500/psb_gem.c +++ b/drivers/staging/gma500/psb_gem.c @@ -100,8 +100,8 @@ static int psb_gem_create(struct drm_file *file, /* Allocate our object - for now a direct gtt range which is not stolen memory backed */ r = psb_gtt_alloc_range(dev, size, "gem", 0); - if (IS_ERR(r)) - return PTR_ERR(r); + if (r == NULL) + return -ENOSPC; /* 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); @@ -135,7 +135,7 @@ static int psb_gem_create(struct drm_file *file, int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args) { - args->pitch = ALIGN(args->width & ((args->bpp + 1) / 8), 64); + args->pitch = ALIGN(args->width * ((args->bpp + 7) / 8), 64); args->size = args->pitch * args->height; return psb_gem_create(file, dev, args->size, &args->handle); } diff --git a/drivers/staging/gma500/psb_gtt.c b/drivers/staging/gma500/psb_gtt.c index 10d772a..dc0a4b7 100644 --- a/drivers/staging/gma500/psb_gtt.c +++ b/drivers/staging/gma500/psb_gtt.c @@ -277,7 +277,7 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len, } else { /* The rest we will use for GEM backed objects */ start = r->start + dev_priv->pg->stolen_size; - end = -1; + end = r->end; } gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL); |