diff options
| author | Daniel Vetter | 2017-02-10 16:27:24 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2017-02-10 16:27:24 +0100 |
| commit | 51a831a7725b1273381cb4a9f3f0d619276e3521 (patch) | |
| tree | 9ba8c84b99e828b8e40e08df22c23712bb13f8c0 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | drm/i915/byt: Take powerwell for reading PIPESTAT in debugfs (diff) | |
| parent | Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | kernel-qcow2-linux-51a831a7725b1273381cb4a9f3f0d619276e3521.tar.gz kernel-qcow2-linux-51a831a7725b1273381cb4a9f3f0d619276e3521.tar.xz kernel-qcow2-linux-51a831a7725b1273381cb4a9f3f0d619276e3521.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Chris Wilson needs the new drm_driver->release callback to make sure
the shiny new dma-buf testcases don't oops the driver on unload.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index cba12ee90cbf..82ca8f49fec1 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -55,9 +55,9 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, return -ENODEV; mutex_lock(&dev_priv->mm.stolen_lock); - ret = drm_mm_insert_node_in_range(&dev_priv->mm.stolen, node, size, - alignment, start, end, - DRM_MM_SEARCH_DEFAULT); + ret = drm_mm_insert_node_in_range(&dev_priv->mm.stolen, node, + size, alignment, 0, + start, end, DRM_MM_INSERT_BEST); mutex_unlock(&dev_priv->mm.stolen_lock); return ret; |