[git pull] drm amd/intel fixes

From: Dave Airlie
Date: Sat Jul 02 2016 - 02:45:41 EST



Hi Linus,

Just some AMD and Intel fixes, the AMD ones are further production Polaris
fixes, and the Intel ones fix some early timeouts, some PCI ID changes
and a couple of other fixes.

Still a bit Internet challenged here, hopefully end of next week will
solve it.

Dave.

The following changes since commit dbdc3bb74faeec5fd92e28c15c945045d5aab426:

Merge tag 'acpi-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2016-07-01 15:31:48 -0700)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.7-rc6

for you to fetch changes up to 88c087109b5fedaf9b61839d08543fdaf9d5ec39:

Merge tag 'drm-intel-fixes-2016-06-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2016-07-02 15:50:41 +1000)

----------------------------------------------------------------
Dave Airlie (2):
Merge branch 'drm-fixes-4.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-intel-fixes-2016-06-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Imre Deak (4):
drm/i915/bxt: Avoid early timeout during PLL enable
drm/i915/lpt: Avoid early timeout during FDI PHY reset
drm/i915/hsw: Avoid early timeout during LCPLL disable/restore
drm/i915: Avoid early timeout during AUX transfers

Ken Wang (1):
drm/amdgpu: add ACLK_CNTL setting for polaris10

Rex Zhu (6):
drm/amd/powerplay: add some definition for FFC feature on polaris.
drm/amd/powerplay: disable FFC.
drm/amd/powerplay: Update CKS on/ CKS off voltage offset calculation
drm/amd/powerplay: Workaround for Memory EDC Error on Polaris10.
drm/amd/powerplay: fix issue uvd dpm can't enabled on Polaris11.
drm/amd/powerplay: workaround for UVD clock issue

Rodrigo Vivi (2):
drm/i915: Add more Kabylake PCI IDs.
drm/i915: Removing PCI IDs that are no longer listed as Kabylake.

Ville Syrjälä (1):
drm/i915: Refresh cached DP port register value on resume

Wei Yongjun (1):
drm/i915: Fix missing unlock on error in i915_ppgtt_info()

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 179 ++++++++++++++-------
.../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h | 1 +
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 +
.../gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h | 2 +
drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h | 3 +-
drivers/gpu/drm/i915/i915_debugfs.c | 4 +-
drivers/gpu/drm/i915/intel_display.c | 16 +-
drivers/gpu/drm/i915/intel_dp.c | 10 +-
drivers/gpu/drm/i915/intel_dpll_mgr.c | 4 +-
include/drm/i915_pciids.h | 10 +-
12 files changed, 160 insertions(+), 78 deletions(-)