gma: Consolidate Intel IGD ACPI code some more

Consolidate some common (and mostly broken) code. Will try to fix things
in separate commits.

Maybe, igd.asl taken from gm45 (the non-PCH case) could also be used for
i945 and sch. But this needs further investigation.

Change-Id: Id3663bf588458e1e71920b96a3149f96947921e9
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/11702
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Nico Huber 2015-08-27 15:07:03 +02:00 committed by Nico Huber
parent b66d6739c8
commit 62047d1e4a
11 changed files with 9 additions and 165 deletions

View File

@ -73,5 +73,5 @@ Device (GFX0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
#include "common.asl"
}

View File

@ -74,5 +74,5 @@ Device (GFX0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
#include "common.asl"
}

View File

@ -79,4 +79,4 @@ Device (PDRC)
#include "peg.asl"
// Integrated graphics 0:2.0
#include "igd.asl"
#include <drivers/intel/gma/acpi/non-pch.asl>

View File

@ -51,4 +51,4 @@ Device (PDRC)
}
// Integrated graphics 0:2.0
#include "igd.asl"
#include <drivers/intel/gma/acpi/pch.asl>

View File

@ -1,78 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2007-2009 coresystems GmbH
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 of
* the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc.
*/
Device (GFX0)
{
Name (_ADR, 0x00020000)
OperationRegion (GFXC, PCI_Config, 0x00, 0x0100)
Field (GFXC, DWordAcc, NoLock, Preserve)
{
Offset (0x10),
BAR0, 64
}
OperationRegion (GFRG, SystemMemory, And(BAR0, 0xfffffffffffffff0), 0x400000)
Field (GFRG, DWordAcc, NoLock, Preserve)
{
Offset (0x48254),
BCLV, 16,
Offset (0xc8250),
CR1, 32,
CR2, 32
}
Name (BRIG, Package (0x12)
{
0x61,
0x61,
0x2,
0x4,
0x5,
0x7,
0x9,
0xb,
0xd,
0x11,
0x14,
0x17,
0x1c,
0x20,
0x27,
0x31,
0x41,
0x61,
})
Method (XBCM, 1, NotSerialized)
{
Store (ShiftLeft (Arg0, 4), BCLV)
Store (0x80000000, CR1)
Store (0x061a061a, CR2)
}
Method (XBQC, 0, NotSerialized)
{
Store (BCLV, Local0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
}

View File

@ -58,7 +58,7 @@ Device (GFX0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
#include <drivers/intel/gma/acpi/common.asl>
}
Device (DSPC)
@ -70,4 +70,4 @@ Device (DSPC)
Offset (0xf4),
BRTC, 8
}
}
}

View File

@ -1,78 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2007-2009 coresystems GmbH
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 of
* the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc.
*/
Device (GFX0)
{
Name (_ADR, 0x00020000)
OperationRegion (GFXC, PCI_Config, 0x00, 0x0100)
Field (GFXC, DWordAcc, NoLock, Preserve)
{
Offset (0x10),
BAR0, 64
}
OperationRegion (GFRG, SystemMemory, And(BAR0, 0xfffffffffffffff0), 0x400000)
Field (GFRG, DWordAcc, NoLock, Preserve)
{
Offset (0x48254),
BCLV, 16,
Offset (0xc8250),
CR1, 32,
CR2, 32
}
Name (BRIG, Package (0x12)
{
0x61,
0x61,
0x2,
0x4,
0x5,
0x7,
0x9,
0xb,
0xd,
0x11,
0x14,
0x17,
0x1c,
0x20,
0x27,
0x31,
0x41,
0x61,
})
Method (XBCM, 1, NotSerialized)
{
Store (ShiftLeft (Arg0, 4), BCLV)
Store (0x80000000, CR1)
Store (0x061a061a, CR2)
}
Method (XBQC, 0, NotSerialized)
{
Store (BCLV, Local0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
}

View File

@ -55,4 +55,4 @@ Device (PDRC)
}
// Integrated graphics 0:2.0
#include "igd.asl"
#include <drivers/intel/gma/acpi/pch.asl>

View File

@ -55,4 +55,4 @@ Device (PDRC)
}
// Integrated graphics 0:2.0
#include "igd.asl"
#include <drivers/intel/gma/acpi/pch.asl>

View File

@ -73,5 +73,5 @@ Device (GFX0)
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
#include <drivers/intel/gma/igd.asl>
#include <drivers/intel/gma/acpi/common.asl>
}