diff --git a/[refs] b/[refs] index 8bb2ae84b130..7247e82ccb31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a229fd54db17f39ce14348c9de898b3671771ca +refs/heads/master: 4f0c8f43ee5e9e12ed36a5950e19cfe513669ae7 diff --git a/trunk/drivers/staging/gma500/psb_fb.c b/trunk/drivers/staging/gma500/psb_fb.c index ae097cd883f5..99c03a2e06bd 100644 --- a/trunk/drivers/staging/gma500/psb_fb.c +++ b/trunk/drivers/staging/gma500/psb_fb.c @@ -648,6 +648,8 @@ static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb, { struct psb_framebuffer *psbfb = to_psb_fb(fb); struct gtt_range *r = psbfb->gtt; + if (r->stolen) + return -EOPNOTSUPP; return drm_gem_handle_create(file_priv, &r->gem, handle); }