diff options
| author | Dave Airlie <[email protected]> | 2013-05-03 00:13:08 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2013-05-03 00:13:08 +0000 |
| commit | d2dbaaf6265d292575bfe41bf668b0cab759e19c (patch) | |
| tree | 255a26df4d499798d0af62d43773594ca2cd0ad7 /drivers/gpu/drm/ast/ast_drv.h | |
| parent | Merge tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/lin... (diff) | |
| parent | drm/cirrus: deal with bo reserve fail in dirty update path (diff) | |
| download | kernel-d2dbaaf6265d292575bfe41bf668b0cab759e19c.tar.gz kernel-d2dbaaf6265d292575bfe41bf668b0cab759e19c.zip | |
Merge branch 'server-fixes' into drm-next
Merge the fixes for the server driver dirty update paths
* server-fixes:
drm/cirrus: deal with bo reserve fail in dirty update path
drm/ast: deal with bo reserve fail in dirty update path
drm/mgag200: deal with bo reserve fail in dirty update path
Diffstat (limited to 'drivers/gpu/drm/ast/ast_drv.h')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 528429252f0f..02e52d543e4b 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -241,6 +241,8 @@ struct ast_fbdev { void *sysram; int size; struct ttm_bo_kmap_obj mapping; + int x1, y1, x2, y2; /* dirty rect */ + spinlock_t dirty_lock; }; #define to_ast_crtc(x) container_of(x, struct ast_crtc, base) |