Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3762 → Rev 3763

/drivers/include/drm/drmP.h
56,7 → 56,9
#include <linux/bug.h>
#include <linux/sched.h>
 
//#include <linux/miscdevice.h>
#include <linux/firmware.h>
#include <linux/err.h>
 
//#include <linux/fs.h>
//#include <linux/proc_fs.h>
//#include <linux/init.h>
/drivers/include/drm/drm_mem_util.h
0,0 → 1,67
/*
* Copyright © 2008 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Authors:
* Jesse Barnes <jbarnes@virtuousgeek.org>
*
*/
#ifndef _DRM_MEM_UTIL_H_
#define _DRM_MEM_UTIL_H_
 
static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
{
void *p;
 
if (size != 0 && nmemb > SIZE_MAX / size)
return NULL;
 
if (size * nmemb <= PAGE_SIZE)
return calloc(nmemb, size);
 
p = (void*)KernelAlloc(size * nmemb);
if ( p != NULL )
memset(p, 0,size * nmemb);
 
return p;
}
 
/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
{
if (size != 0 && nmemb > SIZE_MAX / size)
return NULL;
 
if (size * nmemb <= PAGE_SIZE)
return kmalloc(nmemb * size, GFP_KERNEL);
 
return (void*)KernelAlloc(size * nmemb);
}
 
static __inline void drm_free_large(void *ptr)
{
if( ((addr_t)ptr & 0xFFF) == 0 ) // !!!
KernelFree(ptr);
else
kfree(ptr);
}
 
#endif
/drivers/include/drm/ttm/ttm_memory.h
28,12 → 28,12
#ifndef TTM_MEMORY_H
#define TTM_MEMORY_H
 
//#include <linux/workqueue.h>
#include <linux/workqueue.h>
#include <linux/spinlock.h>
#include <linux/bug.h>
#include <linux/wait.h>
#include <linux/errno.h>
//#include <linux/kobject.h>
#include <linux/kobject.h>
#include <linux/mm.h>
 
/**
75,7 → 75,7
#define TTM_MEM_MAX_ZONES 2
struct ttm_mem_zone;
struct ttm_mem_global {
// struct kobject kobj;
struct kobject kobj;
struct ttm_mem_shrink *shrink;
struct workqueue_struct *swap_queue;
struct work_struct work;