diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 13:49:56 +1000 |
| commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
| tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /drivers/gpu/drm/qxl/qxl_drv.h | |
| parent | ba391646d0d43aee3596b616113cce0f22dde627 (diff) | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index c9c54260cc6c..3ad6604b34ce 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -135,6 +135,8 @@ struct qxl_crtc { int index; int cur_x; int cur_y; + int hot_spot_x; + int hot_spot_y; }; struct qxl_output { |