Merge Rockchip pmdomain fix into next/defconfig

Browse source

Commit e330eb86ba ("ARM: multi_v7_defconfig: enable Rockchip io-domain
driver") turns on a driver that was broken on 4.4-rc3 and fixed in 4.4-rc4.

This backmerges in the bugfix from mainline to keep the defconfig branch
testable by itself.

* commit 'd7b53fd9e3':
  drm/rockchip: vop: Correct enabled clocks during setup
  drm/i915: Don't override output type for DDI HDMI
  drm/i915: Don't compare has_drrs strictly in pipe config
  drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling

...

This commit is contained in:

Arnd Bergmann 2016-01-07 22:11:36 +01:00

parent 954e953c27 d7b53fd9e3

commit b9e24d30f6

4 changed files with 43 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

36

drivers/gpu/drm/i915/i915_gem_fence.c

View file

1

drivers/gpu/drm/i915/intel_display.c

View file

3

drivers/gpu/drm/i915/intel_dp.c

View file

36

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

View file