diff options
| author | Dave Airlie <airlied@gmail.com> | 2015-01-04 17:41:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2015-01-04 17:41:00 +1000 |
| commit | 379a2d31cb8d1eddf1970be95b871b4371be296a (patch) | |
| tree | 034ac65ad43a28fc0c0a32e5cc6dedc9ea4616ca /drivers/gpu/drm/i915/i915_drv.h | |
| parent | d753856c9f9ae33a980192aa7b81d8b97d79dec2 (diff) | |
| parent | 5d77d9c5e177d2182df5d9fd61ba986facb64415 (diff) | |
Merge tag 'drm-intel-next-fixes-2014-12-30' of git://anongit.freedesktop.org/drm-intel into linus
I've had these since before -rc1, but they missed my last pull
request. Real bug fixes and mostly cc: stable material.
* tag 'drm-intel-next-fixes-2014-12-30' of git://anongit.freedesktop.org/drm-intel:
drm/i915: add missing rpm ref to i915_gem_pwrite_ioctl
Revert "drm/i915: Preserve VGACNTR bits from the BIOS"
drm/i915: Don't call intel_prepare_page_flip() multiple times on gen2-4
drm/i915: Kill check_power_well() calls
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 70d0f0f06f1..e9f891c432f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1756,8 +1756,6 @@ struct drm_i915_private { */ struct workqueue_struct *dp_wq; - uint32_t bios_vgacntr; - /* Abstract the submission mechanism (legacy ringbuffer or execlists) away */ struct { int (*do_execbuf)(struct drm_device *dev, struct drm_file *file, |