Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 190be112 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

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: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6f3ef5dd

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -11359,7 +11359,7 @@ intel_display_capture_error_state(struct drm_device *dev) 
	if (error == NULL)

	if (error == NULL)

		return NULL;

		return NULL;





	if (HAS_POWER_WELL(dev))

	if (IS_HASWELL(dev) || IS_BROADWELL(dev))

		error->power_well_driver = I915_READ(HSW_PWR_WELL_DRIVER);

		error->power_well_driver = I915_READ(HSW_PWR_WELL_DRIVER);





	for_each_pipe(i) {

	for_each_pipe(i) {
@@ -11430,7 +11430,7 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m, 
		return;

		return;





	err_printf(m, "Num Pipes: %d\n", INTEL_INFO(dev)->num_pipes);

	err_printf(m, "Num Pipes: %d\n", INTEL_INFO(dev)->num_pipes);

	if (HAS_POWER_WELL(dev))

	if (IS_HASWELL(dev) || IS_BROADWELL(dev))

		err_printf(m, "PWR_WELL_CTL2: %08x\n",

		err_printf(m, "PWR_WELL_CTL2: %08x\n",

			   error->power_well_driver);

			   error->power_well_driver);

	for_each_pipe(i) {

	for_each_pipe(i) {