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

Commit 3b617967 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename i915_opregion.c to intel_opregion.c 



It's part of the generic Intel driver infrastructure so rename it in
prepreparation for using it for VBT.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 19c55da1

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ 
	  dvo_tfp410.o \

	  dvo_sil164.o



i915-$(CONFIG_ACPI)	+= i915_opregion.o

i915-$(CONFIG_ACPI)	+= intel_opregion.o

i915-$(CONFIG_COMPAT)   += i915_ioc32.o



obj-$(CONFIG_DRM_I915)  += i915.o

drivers/gpu/drm/i915/i915_drv.h

+7 −7
Original line number Diff line number Diff line
@@ -1054,18 +1054,18 @@ extern int i915_save_state(struct drm_device *dev); 
extern int i915_restore_state(struct drm_device *dev);



#ifdef CONFIG_ACPI

/* i915_opregion.c */

/* intel_opregion.c */

extern int intel_opregion_init(struct drm_device *dev, int resume);

extern void intel_opregion_free(struct drm_device *dev, int suspend);

extern void opregion_asle_intr(struct drm_device *dev);

extern void ironlake_opregion_gse_intr(struct drm_device *dev);

extern void opregion_enable_asle(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 int intel_opregion_init(struct drm_device *dev, int resume) { return 0; }

static inline void intel_opregion_free(struct drm_device *dev, int suspend) { return; }

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

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

static inline void opregion_enable_asle(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



/* modesetting */

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) 




	if (de_iir & DE_GSE)

		ironlake_opregion_gse_intr(dev);

		intel_opregion_gse_intr(dev);



	if (de_iir & DE_PLANEA_FLIP_DONE) {

		intel_prepare_page_flip(dev, 0);
@@ -1065,7 +1065,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) 
		if ((pipea_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||

		    (pipeb_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||

		    (iir & I915_ASLE_INTERRUPT))

			opregion_asle_intr(dev);

			intel_opregion_asle_intr(dev);



		/* With MSI, interrupts are only generated when iir

		 * transitions from zero to nonzero.  If another bit got
@@ -1252,7 +1252,7 @@ void i915_enable_interrupt (struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;



	if (!HAS_PCH_SPLIT(dev))

		opregion_enable_asle(dev);

		intel_opregion_enable_asle(dev);

	dev_priv->irq_enabled = 1;

}
@@ -1570,7 +1570,7 @@ int i915_driver_irq_postinstall(struct drm_device *dev) 
		I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);

	}



	opregion_enable_asle(dev);

	intel_opregion_enable_asle(dev);



	return 0;

}

drivers/gpu/drm/i915/i915_opregion.c→drivers/gpu/drm/i915/intel_opregion.c

+5 −4
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static u32 asle_set_pfit(struct drm_device *dev, u32 pfit) 
	return 0;

}



void opregion_asle_intr(struct drm_device *dev)

void intel_opregion_asle_intr(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct opregion_asle *asle = dev_priv->opregion.asle;
@@ -273,7 +273,8 @@ static u32 asle_set_backlight_ironlake(struct drm_device *dev, u32 bclp) 
	return 0;

}



void ironlake_opregion_gse_intr(struct drm_device *dev)

/* Only present on Ironlake+ */

void intel_opregion_gse_intr(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct opregion_asle *asle = dev_priv->opregion.asle;
@@ -315,7 +316,7 @@ void ironlake_opregion_gse_intr(struct drm_device *dev) 
#define ASLE_PFIT_EN   (1<<2)

#define ASLE_PFMB_EN   (1<<3)



void opregion_enable_asle(struct drm_device *dev)

void intel_opregion_enable_asle(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct opregion_asle *asle = dev_priv->opregion.asle;
@@ -510,7 +511,7 @@ int intel_opregion_init(struct drm_device *dev, int resume) 
	if (mboxes & MBOX_ASLE) {

		DRM_DEBUG_DRIVER("ASLE supported\n");

		opregion->asle = base + OPREGION_ASLE_OFFSET;

		opregion_enable_asle(dev);

		intel_opregion_enable_asle(dev);

	}



	if (!resume)