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

Commit d839ede4 authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500: opregion and ACPI 



Add the opregion support and bring us in line with the opregion functionality in the
reference driver code. We can't share this with i915 currently because there are
hardcoded assumptions about dev_priv etc in both versions.

[airlied: include opregion.h fix]

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9aba9d3a

drivers/gpu/drm/gma500/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ gma500_gfx-y += gem_glue.o \ 
	  intel_bios.o \

	  intel_i2c.o \

	  intel_gmbus.o \

	  intel_opregion.o \

	  mmu.o \

	  opregion.o \

	  power.o \

	  psb_drv.o \

	  psb_intel_display.o \

drivers/gpu/drm/gma500/cdv_device.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int cdv_backlight_init(struct drm_device *dev) 


	cdv_backlight_device->props.brightness =

			cdv_get_brightness(cdv_backlight_device);

	cdv_backlight_device->props.max_brightness = cdv_get_max_brightness;

	cdv_backlight_device->props.max_brightness = cdv_get_max_backlight(dev);

	backlight_update_status(cdv_backlight_device);

	dev_priv->backlight_device = cdv_backlight_device;

	return 0;
@@ -490,7 +490,7 @@ static int cdv_chip_setup(struct drm_device *dev) 
	struct drm_psb_private *dev_priv = dev->dev_private;

	INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);

	cdv_get_core_freq(dev);

	gma_intel_opregion_init(dev);

	psb_intel_opregion_init(dev);

	psb_intel_init_bios(dev);

	cdv_hotplug_enable(dev, false);

	return 0;

drivers/gpu/drm/gma500/oaktrail_device.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int oaktrail_chip_setup(struct drm_device *dev) 
		return ret;

	if (vbt->size == 0) {

		/* Now pull the BIOS data */

		gma_intel_opregion_init(dev);

		psb_intel_opregion_init(dev);

		psb_intel_init_bios(dev);

	}

	oaktrail_hdmi_setup(dev);

drivers/gpu/drm/gma500/intel_opregion.c→drivers/gpu/drm/gma500/opregion.c

+350 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2010 Intel Corporation

 * Copyright 2011 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,13 @@ 
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 *

 * FIXME: resolve with the i915 version

 */



#ifdef CONFIG_ACPI

#include <linux/acpi.h>

#include <linux/acpi_io.h>

#endif

#include "psb_drv.h"

#include "psb_intel_reg.h"



#define PCI_ASLE 0xe4

#define PCI_ASLS 0xfc
@@ -72,15 +75,12 @@ struct opregion_acpi { 
	u32 cnot;	/* current OS notification */

	u32 nrdy;	/* driver status */

	u8 rsvd2[60];

} __attribute__((packed));

} __packed;



/* OpRegion mailbox #2: SWSCI */

struct opregion_swsci {

	u32 scic;       /* SWSCI command|status|data */

	u32 parm;       /* command parameters */

	u32 dslp;       /* driver sleep time-out */

	u8 rsvd[244];

} __attribute__((packed));

	/*FIXME: add it later*/

} __packed;



/* OpRegion mailbox #3: ASLE */

struct opregion_asle {
@@ -97,7 +97,7 @@ struct opregion_asle { 
	u8 plut[74];	/* panel LUT and identifier */

	u32 pfmb;	/* PWM freq and min brightness */

	u8 rsvd[102];

} __attribute__((packed));

} __packed;



/* ASLE irq request bits */

#define ASLE_SET_ALS_ILLUM     (1 << 0)
@@ -122,6 +122,22 @@ struct opregion_asle { 
#define ASLE_PFIT_STRETCH_TEXT (1<<1)

#define ASLE_PFIT_STRETCH_GFX (1<<2)



/* response bits of ASLE irq request */

#define ASLE_ALS_ILLUM_FAILED	(1<<10)

#define ASLE_BACKLIGHT_FAILED	(1<<12)

#define ASLE_PFIT_FAILED	(1<<14)

#define ASLE_PWM_FREQ_FAILED	(1<<16)



/* ASLE backlight brightness to set */

#define ASLE_BCLP_VALID                (1<<31)

#define ASLE_BCLP_MSK          (~(1<<31))



/* ASLE panel fitting request */

#define ASLE_PFIT_VALID         (1<<31)

#define ASLE_PFIT_CENTER (1<<0)

#define ASLE_PFIT_STRETCH_TEXT (1<<1)

#define ASLE_PFIT_STRETCH_GFX (1<<2)



/* PWM frequency and minimum brightness */

#define ASLE_PFMB_BRIGHTNESS_MASK (0xff)

#define ASLE_PFMB_BRIGHTNESS_VALID (1<<8)
@@ -130,49 +146,205 @@ struct opregion_asle { 


#define ASLE_CBLV_VALID         (1<<31)



#define ACPI_OTHER_OUTPUT (0<<8)

#define ACPI_VGA_OUTPUT (1<<8)

#define ACPI_TV_OUTPUT (2<<8)

#define ACPI_DIGITAL_OUTPUT (3<<8)

#define ACPI_LVDS_OUTPUT (4<<8)

static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

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

	struct backlight_device *bd = dev_priv->backlight_device;

	u32 max;



	DRM_DEBUG_DRIVER("asle set backlight %x\n", bclp);



	if (!(bclp & ASLE_BCLP_VALID))

		return ASLE_BACKLIGHT_FAILED;



int gma_intel_opregion_init(struct drm_device *dev)

	if (bd == NULL)

		return ASLE_BACKLIGHT_FAILED;



	bclp &= ASLE_BCLP_MSK;

	if (bclp > 255)

		return ASLE_BACKLIGHT_FAILED;



#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

	max = bd->props.max_brightness;

	bd->props.brightness = bclp * max / 255;

	backlight_update_status(bd);

#endif

	asle->cblv = (bclp * 0x64) / 0xff | ASLE_CBLV_VALID;



	return 0;

}



void psb_intel_opregion_asle_intr(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

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

	u32 asle_stat = 0;

	u32 asle_req;



	if (!asle)

		return;



	asle_req = asle->aslc & ASLE_REQ_MSK;

	if (!asle_req) {

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

		return;

	}



	if (asle_req & ASLE_SET_BACKLIGHT)

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



	asle->aslc = asle_stat;

}



#define ASLE_ALS_EN    (1<<0)

#define ASLE_BLC_EN    (1<<1)

#define ASLE_PFIT_EN   (1<<2)

#define ASLE_PFMB_EN   (1<<3)



void psb_intel_opregion_enable_asle(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

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



	if (asle) {

		/* Don't do this on Medfield or other non PC like devices, they

		   use the bit for something different altogether */

		psb_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);

		psb_enable_pipestat(dev_priv, 1, PIPE_LEGACY_BLC_EVENT_ENABLE);



		asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN

								| ASLE_PFMB_EN;

		asle->ardy = 1;

	}

}



#define ACPI_EV_DISPLAY_SWITCH (1<<0)

#define ACPI_EV_LID            (1<<1)

#define ACPI_EV_DOCK           (1<<2)



static struct psb_intel_opregion *system_opregion;



static int psb_intel_opregion_video_event(struct notifier_block *nb,

					  unsigned long val, void *data)

{

	/* The only video events relevant to opregion are 0x80. These indicate

	   either a docking event, lid switch or display switch request. In

	   Linux, these are handled by the dock, button and video drivers.

	   We might want to fix the video driver to be opregion-aware in

	   future, but right now we just indicate to the firmware that the

	   request has been handled */



	struct opregion_acpi *acpi;



	if (!system_opregion)

		return NOTIFY_DONE;



	acpi = system_opregion->acpi;

	acpi->csts = 0;



	return NOTIFY_OK;

}



static struct notifier_block psb_intel_opregion_notifier = {

	.notifier_call = psb_intel_opregion_video_event,

};



void psb_intel_opregion_init(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct psb_intel_opregion *opregion = &dev_priv->opregion;

	u32 opregion_phy;

	void *base;

	u32 *lid_state;



	dev_priv->lid_state = NULL;

	if (!opregion->header)

		return;



	pci_read_config_dword(dev->pdev, 0xfc, &opregion_phy);

	if (opregion_phy == 0)

		return -ENOTSUPP;

	if (opregion->acpi) {

		/* Notify BIOS we are ready to handle ACPI video ext notifs.

		 * Right now, all the events are handled by the ACPI video

		 * module. We don't actually need to do anything with them. */

		opregion->acpi->csts = 0;

		opregion->acpi->drdy = 1;



		system_opregion = opregion;

		register_acpi_notifier(&psb_intel_opregion_notifier);

	}



	if (opregion->asle)

		psb_intel_opregion_enable_asle(dev);

}



void psb_intel_opregion_fini(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct psb_intel_opregion *opregion = &dev_priv->opregion;



	if (!opregion->header)

		return;



	if (opregion->acpi) {

		opregion->acpi->drdy = 0;



		system_opregion = NULL;

		unregister_acpi_notifier(&psb_intel_opregion_notifier);

	}



	/* just clear all opregion memory pointers now */

	iounmap(opregion->header);

	opregion->header = NULL;

	opregion->acpi = NULL;

	opregion->swsci = NULL;

	opregion->asle = NULL;

	opregion->vbt = NULL;

}



int psb_intel_opregion_setup(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct psb_intel_opregion *opregion = &dev_priv->opregion;

	u32 opregion_phy, mboxes;

	void *base;

	int err = 0;



	pci_read_config_dword(dev->pdev, PCI_ASLS, &opregion_phy);

	if (opregion_phy == 0) {

		DRM_DEBUG_DRIVER("ACPI Opregion not supported\n");

		return -ENOTSUPP;

	}

	DRM_DEBUG("OpRegion detected at 0x%8x\n", opregion_phy);

#ifdef CONFIG_ACPI

	base = acpi_os_ioremap(opregion_phy, 8*1024);

#else

	base = ioremap(opregion_phy, 8*1024);

#endif

	if (!base)

		return -ENOMEM;

	/* FIXME: should use _io ops - ditto on i915 */



	if (memcmp(base, OPREGION_SIGNATURE, 16)) {

		DRM_ERROR("opregion signature mismatch\n");

		iounmap(base);

		return -EINVAL;

		DRM_DEBUG_DRIVER("opregion signature mismatch\n");

		err = -EINVAL;

		goto err_out;

	}



	lid_state = base + 0x01ac;



	dev_priv->lid_state = lid_state;

	dev_priv->lid_last_state = readl(lid_state);

	opregion->header = base;

	opregion->vbt = base + OPREGION_VBT_OFFSET;

	return 0;



	opregion->lid_state = base + ACPI_CLID;



	mboxes = opregion->header->mboxes;

	if (mboxes & MBOX_ACPI) {

		DRM_DEBUG_DRIVER("Public ACPI methods supported\n");

		opregion->acpi = base + OPREGION_ACPI_OFFSET;

	}



	if (mboxes & MBOX_ASLE) {

		DRM_DEBUG_DRIVER("ASLE supported\n");

		opregion->asle = base + OPREGION_ASLE_OFFSET;

	}



int gma_intel_opregion_exit(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	if (dev_priv->opregion.header)

		iounmap(dev_priv->opregion.header);

	return 0;



err_out:

	iounmap(base);

	return err;

}

drivers/gpu/drm/gma500/opregion.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 *

 */



extern void psb_intel_opregion_asle_intr(struct drm_device *dev);

extern void psb_intel_opregion_enable_asle(struct drm_device *dev);

extern void psb_intel_opregion_init(struct drm_device *dev);

extern void psb_intel_opregion_fini(struct drm_device *dev);

extern int psb_intel_opregion_setup(struct drm_device *dev);