From: Dave Airlie <airlied@redhat.com>
Date: Wed, 1 Dec 2010 02:10:34 +0000 (+1000)
Subject: Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
X-Git-Tag: firefly_0821_release~7613^2~3318^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=150f8815bbd15c1a91f74033c048fadcd5f3c715;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes

* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
  Revert "drm/i915/dp: use VBT provided eDP params if available"
  drm/i915: Clear pfit registers when not used by any outputs
  drm/i915: fix regression due to ba3d8d749b01548b9
---

150f8815bbd15c1a91f74033c048fadcd5f3c715