Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1119 → Rev 1120

/drivers/video/drm/radeon/radeon.h
44,11 → 44,13
* - TESTING, TESTING, TESTING
*/
 
#include "types.h"
#include "pci.h"
#include <types.h>
#include <list.h>
 
#include "errno-base.h"
#include <pci.h>
 
#include <errno-base.h>
 
#include "radeon_mode.h"
#include "radeon_reg.h"
#include "r300.h"
60,7 → 62,6
extern int radeon_r4xx_atom;
 
 
 
/*
* Copy from radeon_drv.h so we don't have to include both and have conflicting
* symbol;
169,15 → 170,15
unsigned long count_timeout;
// wait_queue_head_t queue;
// rwlock_t lock;
// struct list_head created;
// struct list_head emited;
// struct list_head signaled;
struct list_head created;
struct list_head emited;
struct list_head signaled;
};
 
struct radeon_fence {
struct radeon_device *rdev;
// struct kref kref;
// struct list_head list;
struct list_head list;
/* protected by radeon_fence.lock */
uint32_t seq;
unsigned long timeout;
204,7 → 205,7
struct radeon_object;
 
struct radeon_object_list {
// struct list_head list;
struct list_head list;
struct radeon_object *robj;
uint64_t gpu_offset;
unsigned rdomain;
216,7 → 217,6
 
 
 
 
/*
* GART structures, functions & helpers
*/
255,8 → 255,8
void radeon_gart_fini(struct radeon_device *rdev);
void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
int pages);
//int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
// int pages, struct page **pagelist);
int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
int pages, u32_t *pagelist);
 
 
/*
309,7 → 309,7
* CP & ring.
*/
struct radeon_ib {
// struct list_head list;
struct list_head list;
unsigned long idx;
uint64_t gpu_addr;
struct radeon_fence *fence;
320,10 → 320,10
struct radeon_ib_pool {
// struct mutex mutex;
struct radeon_object *robj;
// struct list_head scheduled_ibs;
struct list_head scheduled_ibs;
struct radeon_ib ibs[RADEON_IB_POOL_SIZE];
bool ready;
// DECLARE_BITMAP(alloc_bm, RADEON_IB_POOL_SIZE);
DECLARE_BITMAP(alloc_bm, RADEON_IB_POOL_SIZE);
};
 
struct radeon_cp {
364,7 → 364,7
struct radeon_cs_reloc {
// struct drm_gem_object *gobj;
struct radeon_object *robj;
// struct radeon_object_list lobj;
struct radeon_object_list lobj;
uint32_t handle;
uint32_t flags;
};
388,7 → 388,7
unsigned nrelocs;
struct radeon_cs_reloc *relocs;
struct radeon_cs_reloc **relocs_ptr;
// struct list_head validated;
struct list_head validated;
/* indices of various chunks */
int chunk_ib_idx;
int chunk_relocs_idx;