]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
drm/i915: use IS_HASWELL/BROADWELL instead of HAS_POWER_WELL
authorImre Deak <imre.deak@intel.com>
Mon, 25 Nov 2013 15:15:31 +0000 (17:15 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 26 Nov 2013 19:06:34 +0000 (20:06 +0100)
commit190be112fc02f6efcf954a82bd49e2c19b3673e8
tree4e400d6cc4c2ae76f9da47f377604edf7cc1f7eb
parent6f3ef5ddabc0ad321678ee091c75b1f082a42707
drm/i915: use IS_HASWELL/BROADWELL instead of HAS_POWER_WELL

In intel_display_capture_error_state we use HAS_POWER_WELL to check if
we are running on Haswell/Broadwell when accessing HSW_PWR_WELL_DRIVER
which is specific to these platforms. Future platforms with power wells
don't have this register, so HAS_POWER_WELL won't work there any more.
Use IS_HASWELL/IS_BROADWELL instead.

v3: fix using logical || instead of bitwise | (Paulo)

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c