diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-22 09:11:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-22 09:11:39 +1000 |
| commit | 2b76a676f797b4bfbe6e856f5f608bed4e6e92b4 (patch) | |
| tree | 3bedc937b383863128db63f47c5c3b716ca0565e /drivers/gpu/drm/drm_gem.c | |
| parent | aec476a6764687fd1a76a272f95537a0aed37a0c (diff) | |
| parent | 6ab11a2635ce988ebc2e798947beb72cf7324119 (diff) | |
Merge branch 'topic/core-stuff' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Some straggling drm core patches
* 'topic/core-stuff' of git://people.freedesktop.org/~danvet/drm-intel:
drm/gem: Always initialize the gem object in object_init
drm/edid: Populate picture aspect ratio for CEA modes
drm/edid: parse the list of additional 3D modes
drm/edid: split VIC display mode lookup into a separate function
drm: Make the connector mode_valid() vfunc return a drm_mode_status enum
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index bed5c3bfed76..5bbad873c798 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -128,11 +128,12 @@ int drm_gem_object_init(struct drm_device *dev, { struct file *filp; + drm_gem_private_object_init(dev, obj, size); + filp = shmem_file_setup("drm mm object", size, VM_NORESERVE); if (IS_ERR(filp)) return PTR_ERR(filp); - drm_gem_private_object_init(dev, obj, size); obj->filp = filp; return 0; |