On Fri, 2010-02-12 at 00:17 +0100, Thomas Hellstrom wrote:
> Signed-off-by: Thomas Hellstrom <thellst...@vmware.com>
Please make a proper short description of the change on the first line
of the commit message.
> drivers/gpu/drm/drm_mm.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
> index cdec329..2ac074c 100644
> --- a/drivers/gpu/drm/drm_mm.c
> +++ b/drivers/gpu/drm/drm_mm.c
> @@ -405,7 +405,8 @@ struct drm_mm_node *drm_mm_search_free_in_range(const
> struct drm_mm *mm,
> wasted += alignment - tmp;
> }
>
> - if (entry->size >= size + wasted) {
> + if (entry->size >= size + wasted &&
> + (entry->start + wasted + size) <= end) {
> if (!best_match)
> return entry;
> if (entry->size < best_size) {
Reviewed-by: Michel Dänzer <daen...@vmware.com>
--
Earthling Michel Dänzer | http://www.vmware.com
Libre software enthusiast | Debian, X and DRI developer
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
