diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:14:50 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:14:50 -0500 |
| commit | bb0f78dd7ded88082b2430c43c65bc821c4ea360 (patch) | |
| tree | 715cdc73d1cdc145074ba76aa1765a4f7cf9b0c1 /drivers/gpu/drm/udl/udl_drv.h | |
| parent | 62cd2fa82a38cb3d653517822c62a39cdbb5f365 (diff) | |
| parent | 677d23b70bf949f75746c80cbae92c233c6b5e2a (diff) | |
Merge branch 'udl-fixes' into drm-next
Fixes for usb/udl devices
* udl-fixes:
drm/udl: disable fb_defio by default
drm/udl: Inline memcmp() for RLE compression of xfer
drm/udl: make usage as a console safer
drm/usb: bind driver to correct device
Diffstat (limited to 'drivers/gpu/drm/udl/udl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 87aa5f5d3c88..cc6d90f28c71 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h | |||
| @@ -75,6 +75,8 @@ struct udl_framebuffer { | |||
| 75 | struct drm_framebuffer base; | 75 | struct drm_framebuffer base; |
| 76 | struct udl_gem_object *obj; | 76 | struct udl_gem_object *obj; |
| 77 | bool active_16; /* active on the 16-bit channel */ | 77 | bool active_16; /* active on the 16-bit channel */ |
| 78 | int x1, y1, x2, y2; /* dirty rect */ | ||
| 79 | spinlock_t dirty_lock; | ||
| 78 | }; | 80 | }; |
| 79 | 81 | ||
| 80 | #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base) | 82 | #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base) |