tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'airlied/drm-core-next' into tmp

Browse Source
This commit is contained in:
Chris Wilson
2010-10-19 09:13:00 +01:00
parent 2d7b8366ae 21c74a8ea8
commit fb9a90f7c6
435 changed files with 3338 additions and 1800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/drm/drm_crtc_helper.h
+6 -1
View File
@@ -39,6 +39,11 @@
#include <linux/fb.h>
enum mode_set_atomic {
LEAVE_ATOMIC_MODE_SET,
ENTER_ATOMIC_MODE_SET,
};
struct drm_crtc_helper_funcs {
/*
* Control power levels on the CRTC. If the mode passed in is
@@ -62,7 +67,7 @@ struct drm_crtc_helper_funcs {
struct drm_framebuffer *old_fb);
int (*mode_set_base_atomic)(struct drm_crtc *crtc,
struct drm_framebuffer *fb, int x, int y,
int is_enter);
enum mode_set_atomic);
/* reload the current crtc LUT */
void (*load_lut)(struct drm_crtc *crtc);
include/drm/ttm/ttm_bo_api.h
+3 -1
View File
@@ -247,9 +247,11 @@ struct ttm_buffer_object {
atomic_t reserved;
/**
* Members protected by the bo::lock
* In addition, setting sync_obj to anything else
* than NULL requires bo::reserved to be held. This allows for
* checking NULL while reserved but not holding bo::lock.
*/
void *sync_obj_arg;
include/drm/ttm/ttm_bo_driver.h
+4
View File
@@ -214,6 +214,8 @@ struct ttm_mem_type_manager_func {
struct ttm_mem_reg *mem);
void (*put_node)(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem);
void (*put_node_locked)(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem);
void (*debug)(struct ttm_mem_type_manager *man, const char *prefix);
};
@@ -667,6 +669,8 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo,
extern void ttm_bo_mem_put(struct ttm_buffer_object *bo,
struct ttm_mem_reg *mem);
extern void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo,
struct ttm_mem_reg *mem);
/**
* ttm_bo_wait_for_cpu