Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1986 → Rev 1987

/drivers/include/drm/drmP.h
130,59 → 130,8
#define dev_info(dev, format, arg...) \
printk("Info %s " format , __func__, ## arg)
 
/**
* This structure defines the drm_mm memory object, which will be used by the
* DRM for its buffer objects.
*/
struct drm_gem_object {
/** Reference count of this object */
struct kref refcount;
 
/** Handle count of this object. Each handle also holds a reference */
struct kref handlecount;
 
/** Related drm device */
struct drm_device *dev;
 
/** File representing the shmem storage */
// struct file *filp;
 
/* Mapping info for this object */
// struct drm_map_list map_list;
 
/**
* Size of the object, in bytes. Immutable over the object's
* lifetime.
*/
size_t size;
 
/**
* Global name for this object, starts at 1. 0 means unnamed.
* Access is covered by the object_name_lock in the related drm_device
*/
int name;
 
/**
* Memory domains. These monitor which caches contain read/write data
* related to the object. When transitioning from one set of domains
* to another, the driver is called to ensure that caches are suitably
* flushed and invalidated
*/
uint32_t read_domains;
uint32_t write_domain;
 
/**
* While validating an exec operation, the
* new read/write domain values are computed here.
* They will be transferred to the above values
* at the point that any cache flushing occurs
*/
uint32_t pending_read_domains;
uint32_t pending_write_domain;
 
void *driver_private;
};
 
static inline int drm_sysfs_connector_add(struct drm_connector *connector)
{ return 0; };
 
668,6 → 617,8
struct drm_open_hash offset_hash; /**< User token hash table for maps */
};
 
#endif
 
/**
* This structure defines the drm_mm memory object, which will be used by the
* DRM for its buffer objects.
686,7 → 637,7
struct file *filp;
 
/* Mapping info for this object */
struct drm_map_list map_list;
// struct drm_map_list map_list;
 
/**
* Size of the object, in bytes. Immutable over the object's
721,6 → 672,8
void *driver_private;
};
 
#if 0
 
#include "drm_crtc.h"
 
/* per-master structure */
1633,12 → 1586,13
int drm_gem_handle_create(struct drm_file *file_priv,
struct drm_gem_object *obj,
u32 *handlep);
int drm_gem_handle_delete(struct drm_file *filp, u32 handle);
 
static inline void
drm_gem_object_handle_reference(struct drm_gem_object *obj)
{
drm_gem_object_reference(obj);
kref_get(&obj->handlecount);
atomic_inc(&obj->handle_count);
}
 
static inline void
1647,6 → 1601,8
if (obj == NULL)
return;
 
if (atomic_read(&obj->handle_count) == 0)
return;
/*
* Must bump handle count first as this may be the last
* ref, in which case the object would disappear before we
1682,7 → 1638,6
return NULL;
}
 
 
static __inline__ void drm_core_dropmap(struct drm_local_map *map)
{
}
/drivers/include/drm/drm_crtc.h
520,6 → 520,8
uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
uint32_t force_encoder_id;
struct drm_encoder *encoder; /* currently active encoder */
 
int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
};
 
/**
655,7 → 657,7
extern char *drm_get_dvi_i_select_name(int val);
extern char *drm_get_tv_subconnector_name(int val);
extern char *drm_get_tv_select_name(int val);
//extern void drm_fb_release(struct drm_file *file_priv);
extern void drm_fb_release(struct drm_file *file_priv);
extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
extern struct edid *drm_get_edid(struct drm_connector *connector,
struct i2c_adapter *adapter);