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

Commit 862daefc authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915/opregion: Use ASLE response codes defined in 0.1 



Within i915_opregion.c there are two blocks of semantically identical
ASLE response codes defined. Only one of those matches the ACPI IGD
OpRegion Specification 0.1, use those.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMatthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 868dc58f

drivers/gpu/drm/i915/i915_opregion.c

+3 −7
Original line number Diff line number Diff line
@@ -114,10 +114,6 @@ struct opregion_asle { 
#define ASLE_REQ_MSK           0xf



/* response bits of ASLE irq request */

#define ASLE_ALS_ILLUM_FAIL    (2<<10)

#define ASLE_BACKLIGHT_FAIL    (2<<12)

#define ASLE_PFIT_FAIL         (2<<14)

#define ASLE_PWM_FREQ_FAIL     (2<<16)

#define ASLE_ALS_ILLUM_FAILED	(1<<10)

#define ASLE_BACKLIGHT_FAILED	(1<<12)

#define ASLE_PFIT_FAILED	(1<<14)
@@ -155,11 +151,11 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) 
	u32 max_backlight, level, shift;



	if (!(bclp & ASLE_BCLP_VALID))

		return ASLE_BACKLIGHT_FAIL;

		return ASLE_BACKLIGHT_FAILED;



	bclp &= ASLE_BCLP_MSK;

	if (bclp < 0 || bclp > 255)

		return ASLE_BACKLIGHT_FAIL;

		return ASLE_BACKLIGHT_FAILED;



	blc_pwm_ctl = I915_READ(BLC_PWM_CTL);

	blc_pwm_ctl2 = I915_READ(BLC_PWM_CTL2);
@@ -211,7 +207,7 @@ static u32 asle_set_pfit(struct drm_device *dev, u32 pfit) 
	/* Panel fitting is currently controlled by the X code, so this is a

	   noop until modesetting support works fully */

	if (!(pfit & ASLE_PFIT_VALID))

		return ASLE_PFIT_FAIL;

		return ASLE_PFIT_FAILED;

	return 0;

}