diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:13:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-03 10:13:08 +1000 |
| commit | d2dbaaf6265d292575bfe41bf668b0cab759e19c (patch) | |
| tree | 255a26df4d499798d0af62d43773594ca2cd0ad7 /drivers/gpu/drm/mgag200/mgag200_drv.h | |
| parent | 7e17fc0b69fbec2c25398adfb18a18fa6b210a53 (diff) | |
| parent | f3b2bbdc8a87a080ccd23d27fca4b87d61340dd4 (diff) | |
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/mgag200/mgag200_drv.h')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index dcfc973e29f..bf29b2f4d68 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -115,6 +115,8 @@ struct mga_fbdev { void *sysram; int size; struct ttm_bo_kmap_obj mapping; + int x1, y1, x2, y2; /* dirty rect */ + spinlock_t dirty_lock; }; struct mga_crtc { |