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

Commit 81a07809 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: drop code duplication in favor of asle interrupt handler 



With the previous work asle and gse interrupt handlers should now be
functionally the same. Drop the duplicated code.

v2: Drop intel_opregion_gse_intr() also in the !CONFIG_ACPI path. (Damien)

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e93d440b

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1821,13 +1821,11 @@ extern int intel_opregion_setup(struct drm_device *dev); 
extern void intel_opregion_init(struct drm_device *dev);

extern void intel_opregion_fini(struct drm_device *dev);

extern void intel_opregion_asle_intr(struct drm_device *dev);

extern void intel_opregion_gse_intr(struct drm_device *dev);

extern void intel_opregion_enable_asle(struct drm_device *dev);

#else

static inline void intel_opregion_init(struct drm_device *dev) { return; }

static inline void intel_opregion_fini(struct drm_device *dev) { return; }

static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }

static inline void intel_opregion_gse_intr(struct drm_device *dev) { return; }

static inline void intel_opregion_enable_asle(struct drm_device *dev) { return; }

#endif

drivers/gpu/drm/i915/i915_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) 
			dp_aux_irq_handler(dev);



		if (de_iir & DE_GSE_IVB)

			intel_opregion_gse_intr(dev);

			intel_opregion_asle_intr(dev);



		for (i = 0; i < 3; i++) {

			if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i)))
@@ -1302,7 +1302,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
		dp_aux_irq_handler(dev);



	if (de_iir & DE_GSE)

		intel_opregion_gse_intr(dev);

		intel_opregion_asle_intr(dev);



	if (de_iir & DE_PIPEA_VBLANK)

		drm_handle_vblank(dev, 0);

drivers/gpu/drm/i915/intel_opregion.c

+0 −37
Original line number Diff line number Diff line
@@ -222,43 +222,6 @@ void intel_opregion_asle_intr(struct drm_device *dev) 
	iowrite32(asle_stat, &asle->aslc);

}



void intel_opregion_gse_intr(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct opregion_asle __iomem *asle = dev_priv->opregion.asle;

	u32 asle_stat = 0;

	u32 asle_req;



	if (!asle)

		return;



	asle_req = ioread32(&asle->aslc) & ASLE_REQ_MSK;



	if (!asle_req) {

		DRM_DEBUG_DRIVER("non asle set request??\n");

		return;

	}



	if (asle_req & ASLE_SET_ALS_ILLUM) {

		DRM_DEBUG_DRIVER("Illum is not supported\n");

		asle_stat |= ASLE_ALS_ILLUM_FAILED;

	}



	if (asle_req & ASLE_SET_BACKLIGHT)

		asle_stat |= asle_set_backlight(dev, ioread32(&asle->bclp));



	if (asle_req & ASLE_SET_PFIT) {

		DRM_DEBUG_DRIVER("Pfit is not supported\n");

		asle_stat |= ASLE_PFIT_FAILED;

	}



	if (asle_req & ASLE_SET_PWM_FREQ) {

		DRM_DEBUG_DRIVER("PWM freq is not supported\n");

		asle_stat |= ASLE_PWM_FREQ_FAILED;

	}



	iowrite32(asle_stat, &asle->aslc);

}

#define ASLE_ALS_EN    (1<<0)

#define ASLE_BLC_EN    (1<<1)

#define ASLE_PFIT_EN   (1<<2)