diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-09-20 08:32:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-09-20 08:32:59 +1000 |
| commit | c21eb21cb50d58e7cbdcb8b9e7ff68b85cfa5095 (patch) | |
| tree | 2ac14a2041ca462c51ee25eca1267f545a852e11 /drivers/gpu/drm/drm_stub.c | |
| parent | 928c2f0c006bf7f381f58af2b2786d2a858ae311 (diff) | |
| download | blackbird-op-linux-c21eb21cb50d58e7cbdcb8b9e7ff68b85cfa5095.tar.gz blackbird-op-linux-c21eb21cb50d58e7cbdcb8b9e7ff68b85cfa5095.zip | |
Revert "drm: mark context support as a legacy subsystem"
This reverts commit 7c510133d93dd6f15ca040733ba7b2891ed61fd1.
Well looks like not enough digging was done, libdrm_nouveau before 2.4.33
used contexts,
292da616fe1f936ca78a3fa8e1b1b19883e343b6 nouveau: pull in major libdrm rewrite
got rid of them,
Reported-by: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Reported-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index e7eb0276f7f1..39d864576be4 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -292,7 +292,13 @@ int drm_fill_in_dev(struct drm_device *dev, goto error_out_unreg; } - drm_legacy_ctxbitmap_init(dev); + + + retcode = drm_ctxbitmap_init(dev); + if (retcode) { + DRM_ERROR("Cannot allocate memory for context bitmap.\n"); + goto error_out_unreg; + } if (driver->driver_features & DRIVER_GEM) { retcode = drm_gem_init(dev); @@ -446,7 +452,7 @@ void drm_put_dev(struct drm_device *dev) drm_rmmap(dev, r_list->map); drm_ht_remove(&dev->map_hash); - drm_legacy_ctxbitmap_cleanup(dev); + drm_ctxbitmap_cleanup(dev); if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_put_minor(&dev->control); |
