Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1122 → Rev 1123

/drivers/video/drm/radeon/radeon.h
50,7 → 50,7
#include <pci.h>
 
#include <errno-base.h>
 
#include "drm_edid.h"
#include "radeon_mode.h"
#include "radeon_reg.h"
#include "r300.h"
57,11 → 57,12
 
#include <syscall.h>
 
extern int radeon_modeset;
extern int radeon_dynclks;
extern int radeon_r4xx_atom;
extern int radeon_gart_size;
extern int radeon_r4xx_atom;
extern int radeon_connector_table;
 
 
/*
* Copy from radeon_drv.h so we don't have to include both and have conflicting
* symbol;
212,8 → 213,23
unsigned wdomain;
};
 
int radeon_object_init(struct radeon_device *rdev);
void radeon_object_fini(struct radeon_device *rdev);
int radeon_object_create(struct radeon_device *rdev,
struct drm_gem_object *gobj,
unsigned long size,
bool kernel,
uint32_t domain,
bool interruptible,
struct radeon_object **robj_ptr);
 
 
/*
* GEM objects.
*/
struct radeon_gem {
struct list_head objects;
};
 
 
 
1040,40 → 1056,6
};
 
 
 
 
 
/**
* DRM device structure. This structure represent a complete card that
* may contain multiple heads.
*/
struct drm_device {
 
int irq_enabled; /**< True if irq handler is enabled */
__volatile__ long context_flag; /**< Context swapping flag */
__volatile__ long interrupt_flag; /**< Interruption handler flag */
__volatile__ long dma_flag; /**< DMA dispatch flag */
int last_checked; /**< Last context checked for DMA */
int last_context; /**< Last current context */
unsigned long last_switch; /**< jiffies at last context switch */
 
struct drm_agp_head *agp; /**< AGP data */
 
struct pci_dev *pdev; /**< PCI device structure */
int pci_vendor; /**< PCI vendor id */
int pci_device; /** PCI device id */
int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
void *mm_private;
 
// struct address_space *dev_mapping;
 
struct drm_mode_config mode_config; /**< Current mode config */
 
};
 
 
 
#define radeon_errata(rdev) (rdev)->asic->errata((rdev))