Merge branch 'bdw-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 12 Dec 2013 00:38:08 +0000 (10:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Dec 2013 00:38:08 +0000 (10:38 +1000)
As promised bdw fixes come separate for now. Just a few minior things.

* 'bdw-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915/bdw: PIPE_[BC] I[ME]R moved to powerwell
  drm/i915/bdw: Limit GTT to 2GB
  drm/i915/bdw: Add comment about gen8 HWS PGA
  drm/i915/bdw: Free correct number of ppgtt pages
  drm/i915/bdw: Do gen6 style reset for gen8
  drm/i915/bdw: GEN8 backlight support
  drm/i915/bdw: Add BDW to ULT macro

1  2 
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_uncore.c

Simple merge
Simple merge
Simple merge
Simple merge