2012-04-24 14:47:39 +00:00
|
|
|
/*
|
|
|
|
* Copyright © 2008-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.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
* Chris Wilson <chris@chris-wilson.co.uk>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2012-10-02 17:01:07 +00:00
|
|
|
#include <drm/i915_drm.h>
|
2012-04-24 14:47:39 +00:00
|
|
|
#include "i915_drv.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The BIOS typically reserves some of the system's memory for the exclusive
|
|
|
|
* use of the integrated graphics. This memory is no longer available for
|
|
|
|
* use by the OS and so the user finds that his system has less memory
|
|
|
|
* available than he put in. We refer to this memory as stolen.
|
|
|
|
*
|
|
|
|
* The BIOS will allocate its framebuffer from the stolen memory. Our
|
|
|
|
* goal is try to reuse that object for our own fbcon which must always
|
|
|
|
* be available for panics. Anything else we can reuse the stolen memory
|
|
|
|
* for is a boon.
|
|
|
|
*/
|
|
|
|
|
2015-09-14 18:19:57 +00:00
|
|
|
int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
|
|
|
|
struct drm_mm_node *node, u64 size,
|
|
|
|
unsigned alignment, u64 start, u64 end)
|
2015-07-02 22:25:07 +00:00
|
|
|
{
|
2015-07-02 22:25:09 +00:00
|
|
|
int ret;
|
|
|
|
|
2015-07-02 22:25:07 +00:00
|
|
|
if (!drm_mm_initialized(&dev_priv->mm.stolen))
|
|
|
|
return -ENODEV;
|
|
|
|
|
drm/i915: Do NOT skip the first 4k of stolen memory for pre-allocated buffers v2
Before this commit the WaSkipStolenMemoryFirstPage workaround code was
skipping the first 4k by passing 4096 as start of the address range passed
to drm_mm_init(). This means that calling drm_mm_reserve_node() to try and
reserve the firmware framebuffer so that we can inherit it would always
fail, as the firmware framebuffer starts at address 0.
Commit d43537610470 ("drm/i915: skip the first 4k of stolen memory on
everything >= gen8") says in its commit message: "This is confirmed to fix
Skylake screen flickering issues (probably caused by the fact that we
initialized a ring in the first page of stolen, but I didn't 100% confirm
this theory)."
Which suggests that it is safe to use the first page for a linear
framebuffer as the firmware is doing (see note below).
This commit always passes 0 as start to drm_mm_init() and works around
WaSkipStolenMemoryFirstPage in i915_gem_stolen_insert_node_in_range()
by insuring the start address passed by to drm_mm_insert_node_in_range()
is always 4k or more. All entry points to i915_gem_stolen.c go through
i915_gem_stolen_insert_node_in_range(), so that any newly allocated
objects such as ring-buffers will not be allocated in the first 4k.
The one exception is i915_gem_object_create_stolen_for_preallocated()
which directly calls drm_mm_reserve_node() which now will be able to
use the first 4k.
This fixes the i915 driver no longer being able to inherit the firmware
framebuffer on gen8+, which fixes the video output changing from the
vendor logo to a black screen as soon as the i915 driver is loaded
(on systems without fbcon).
Some notes about the mapping of the BIOS framebuffer:
v1 led to some discussion if the assumption of the intel_display.c code
that the firmware framebuffer is a linear mapping of the stolen memory
starting at offset 0 is still correct, because that would mean that the
GOP does not implement the WaSkipStolenMemoryFirstPage workaround.
To verify this the following code was added at the end of
i915_gem_object_create_stolen_for_preallocated() :
pr_err("first ggtt entry before bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
ret = i915_vma_bind(vma,
HAS_LLC(dev_priv) ? I915_CACHE_LLC : I915_CACHE_NONE,
PIN_UPDATE);
pr_err("i915_vma_bind ret %d\n", ret);
pr_err("first ggtt entry after bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
Which prints the mapping of the first page, then does a vma_bind() to
force update the mapping with our linear view of the framebuffer and
then prints the mapping of the first page again.
On an Asrock B150M Pro4S/D3 mainboard with i5-6500 CPU this prints:
[ 1.651141] first ggtt entry before bind: 0x0000000078c00001
[ 1.651151] i915_vma_bind ret 0
[ 1.651152] first ggtt entry after bind: 0x0000000078c00083
And "sudo cat /proc/iomem | grep Stolen" gives:
78c00000-88bfffff : Graphics Stolen Memory
There are no visual changes with this patch (BIOS vendor logo still
stays in place when we inherit the BIOS framebuffer), so the vma_bind()
does not impact which memory is being scanned out.
The address of the first ggtt entry matches with the start of stolen
and the i915_vma_bind call only changes the first gtt entry's flags,
or-ing in _PAGE_RW (BIT(1)) and PPAT_CACHED (BIT(7)), which perfectly
matches what we would expect based on gen8_pte_encode()'s behavior.
So it seems that the GOP indeed does NOT implement the wa and the i915's
code assuming a linear mapping at the start of stolen for the BIOS fb
still holds true for gen8+.
I've also tested this on a Cherry Trail based device (a GPD Win)
with identical results (the flags are 0x1b after the vma_bind
on CHT, which matches with I915_CACHE_NONE).
Changed in v2: No code changes, extended the commit message with the
verification that the intel_display.c BIOS framebuffer mapping is still
correct.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180420095933.16442-1-hdegoede@redhat.com
2018-04-20 09:59:33 +00:00
|
|
|
/* WaSkipStolenMemoryFirstPage:bdw+ */
|
|
|
|
if (INTEL_GEN(dev_priv) >= 8 && start < 4096)
|
|
|
|
start = 4096;
|
|
|
|
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_lock(&dev_priv->mm.stolen_lock);
|
2017-02-02 21:04:38 +00:00
|
|
|
ret = drm_mm_insert_node_in_range(&dev_priv->mm.stolen, node,
|
|
|
|
size, alignment, 0,
|
|
|
|
start, end, DRM_MM_INSERT_BEST);
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_unlock(&dev_priv->mm.stolen_lock);
|
|
|
|
|
|
|
|
return ret;
|
2015-07-02 22:25:07 +00:00
|
|
|
}
|
|
|
|
|
2015-09-14 18:19:57 +00:00
|
|
|
int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
|
|
|
|
struct drm_mm_node *node, u64 size,
|
|
|
|
unsigned alignment)
|
|
|
|
{
|
|
|
|
return i915_gem_stolen_insert_node_in_range(dev_priv, node, size,
|
2016-12-15 13:23:55 +00:00
|
|
|
alignment, 0, U64_MAX);
|
2015-09-14 18:19:57 +00:00
|
|
|
}
|
|
|
|
|
2015-07-02 22:25:07 +00:00
|
|
|
void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
|
|
|
|
struct drm_mm_node *node)
|
|
|
|
{
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_lock(&dev_priv->mm.stolen_lock);
|
2015-07-02 22:25:07 +00:00
|
|
|
drm_mm_remove_node(node);
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_unlock(&dev_priv->mm.stolen_lock);
|
2015-07-02 22:25:07 +00:00
|
|
|
}
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
static int i915_adjust_stolen(struct drm_i915_private *dev_priv,
|
|
|
|
struct resource *dsm)
|
2012-04-24 14:47:39 +00:00
|
|
|
{
|
2016-03-30 13:57:10 +00:00
|
|
|
struct i915_ggtt *ggtt = &dev_priv->ggtt;
|
2013-07-04 11:28:35 +00:00
|
|
|
struct resource *r;
|
drm/i915: Determine the stolen memory base address on gen2
There isn't an explicit stolen memory base register on gen2.
Some old comment in the i915 code suggests we should get it via
max_low_pfn_mapped, but that's clearly a bad idea on my MGM.
The e820 map in said machine looks like this:
[ 0.000000] BIOS-e820: [mem 0x0000000000000000-0x000000000009f7ff] usable
[ 0.000000] BIOS-e820: [mem 0x000000000009f800-0x000000000009ffff] reserved
[ 0.000000] BIOS-e820: [mem 0x00000000000ce000-0x00000000000cffff] reserved
[ 0.000000] BIOS-e820: [mem 0x00000000000dc000-0x00000000000fffff] reserved
[ 0.000000] BIOS-e820: [mem 0x0000000000100000-0x000000001f6effff] usable
[ 0.000000] BIOS-e820: [mem 0x000000001f6f0000-0x000000001f6f7fff] ACPI data
[ 0.000000] BIOS-e820: [mem 0x000000001f6f8000-0x000000001f6fffff] ACPI NVS
[ 0.000000] BIOS-e820: [mem 0x000000001f700000-0x000000001fffffff] reserved
[ 0.000000] BIOS-e820: [mem 0x00000000fec10000-0x00000000fec1ffff] reserved
[ 0.000000] BIOS-e820: [mem 0x00000000ffb00000-0x00000000ffbfffff] reserved
[ 0.000000] BIOS-e820: [mem 0x00000000fff00000-0x00000000ffffffff] reserved
That makes max_low_pfn_mapped = 1f6f0000, so assuming our stolen memory
would start there would place it on top of some ACPI memory regions.
So not a good idea as already stated.
The 9MB region after the ACPI regions at 0x1f700000 however looks
promising given that the macine reports the stolen memory size to be
8MB. Looking at the PGTBL_CTL register, the GTT entries are at offset
0x1fee00000, and given that the GTT entries occupy 128KB, it looks like
the stolen memory could start at 0x1f700000 and the GTT entries would
occupy the last 128KB of the stolen memory.
After some more digging through chipset documentation, I've determined
the BIOS first allocates space for something called TSEG (something to
do with SMM) from the top of memory, and then it allocates the graphics
stolen memory below that. Accordind to the chipset documentation TSEG
has a fixed size of 1MB on 855. So that explains the top 1MB in the
e820 region. And it also confirms that the GTT entries are in fact at
the end of the the stolen memory region.
Derive the stolen memory base address on gen2 the same as the BIOS does
(TOM-TSEG_SIZE-stolen_size). There are a few differences between the
registers on various gen2 chipsets, so a few different codepaths are
required.
865G is again bit more special since it seems to support enough memory
to hit 4GB address space issues. This means the PCI allocations will
also affect the location of the stolen memory. Fortunately there
appears to be the TOUD register which may give us the correct answer
directly. But the chipset docs are a bit unclear, so I'm not 100%
sure that the graphics stolen memory is always the last thing the
BIOS steals. Someone would need to verify it on a real system.
I tested this on the my 830 and 855 machines, and so far everything
looks peachy.
v2: Rewrite to use the TOM-TSEG_SIZE-stolen_size and TOUD methods
v3: Fix TSEG size for 830
v4: Add missing 'else' (Chris)
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-10-08 09:08:20 +00:00
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
if (dsm->start == 0 || dsm->end <= dsm->start)
|
|
|
|
return -EINVAL;
|
2012-04-24 14:47:39 +00:00
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
/*
|
|
|
|
* TODO: We have yet too encounter the case where the GTT wasn't at the
|
|
|
|
* end of stolen. With that assumption we could simplify this.
|
|
|
|
*/
|
2013-07-04 11:28:35 +00:00
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
/* Make sure we don't clobber the GTT if it's within stolen memory */
|
2016-12-07 20:48:09 +00:00
|
|
|
if (INTEL_GEN(dev_priv) <= 4 &&
|
|
|
|
!IS_G33(dev_priv) && !IS_PINEVIEW(dev_priv) && !IS_G4X(dev_priv)) {
|
2017-12-11 15:18:18 +00:00
|
|
|
struct resource stolen[2] = {*dsm, *dsm};
|
|
|
|
struct resource ggtt_res;
|
2017-12-11 15:18:22 +00:00
|
|
|
resource_size_t ggtt_start;
|
2014-06-05 17:02:59 +00:00
|
|
|
|
2016-03-30 13:57:10 +00:00
|
|
|
ggtt_start = I915_READ(PGTBL_CTL);
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
if (IS_GEN(dev_priv, 4))
|
2016-03-30 13:57:10 +00:00
|
|
|
ggtt_start = (ggtt_start & PGTBL_ADDRESS_LO_MASK) |
|
|
|
|
(ggtt_start & PGTBL_ADDRESS_HI_MASK) << 28;
|
2014-06-05 17:02:59 +00:00
|
|
|
else
|
2016-03-30 13:57:10 +00:00
|
|
|
ggtt_start &= PGTBL_ADDRESS_LO_MASK;
|
2017-12-11 15:18:18 +00:00
|
|
|
|
|
|
|
ggtt_res =
|
|
|
|
(struct resource) DEFINE_RES_MEM(ggtt_start,
|
|
|
|
ggtt_total_entries(ggtt) * 4);
|
|
|
|
|
|
|
|
if (ggtt_res.start >= stolen[0].start && ggtt_res.start < stolen[0].end)
|
|
|
|
stolen[0].end = ggtt_res.start;
|
|
|
|
if (ggtt_res.end > stolen[1].start && ggtt_res.end <= stolen[1].end)
|
|
|
|
stolen[1].start = ggtt_res.end;
|
|
|
|
|
|
|
|
/* Pick the larger of the two chunks */
|
|
|
|
if (resource_size(&stolen[0]) > resource_size(&stolen[1]))
|
|
|
|
*dsm = stolen[0];
|
|
|
|
else
|
|
|
|
*dsm = stolen[1];
|
2014-06-05 17:02:59 +00:00
|
|
|
|
|
|
|
if (stolen[0].start != stolen[1].start ||
|
|
|
|
stolen[0].end != stolen[1].end) {
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("GTT within stolen memory at %pR\n", &ggtt_res);
|
|
|
|
DRM_DEBUG_DRIVER("Stolen memory adjusted to %pR\n", dsm);
|
2014-06-05 17:02:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
/*
|
|
|
|
* Verify that nothing else uses this physical address. Stolen
|
2013-07-04 11:28:35 +00:00
|
|
|
* memory should be reserved by the BIOS and hidden from the
|
|
|
|
* kernel. So if the region is already marked as busy, something
|
|
|
|
* is seriously wrong.
|
|
|
|
*/
|
2017-12-11 15:18:18 +00:00
|
|
|
r = devm_request_mem_region(dev_priv->drm.dev, dsm->start,
|
|
|
|
resource_size(dsm),
|
2013-07-04 11:28:35 +00:00
|
|
|
"Graphics Stolen Memory");
|
|
|
|
if (r == NULL) {
|
2014-01-13 10:55:21 +00:00
|
|
|
/*
|
|
|
|
* One more attempt but this time requesting region from
|
2017-12-11 15:18:18 +00:00
|
|
|
* start + 1, as we have seen that this resolves the region
|
2014-01-13 10:55:21 +00:00
|
|
|
* conflict with the PCI Bus.
|
|
|
|
* This is a BIOS w/a: Some BIOS wrap stolen in the root
|
|
|
|
* PCI bus, but have an off-by-one error. Hence retry the
|
|
|
|
* reservation starting from 1 instead of 0.
|
2017-07-19 10:00:43 +00:00
|
|
|
* There's also BIOS with off-by-one on the other end.
|
2014-01-13 10:55:21 +00:00
|
|
|
*/
|
2017-12-11 15:18:18 +00:00
|
|
|
r = devm_request_mem_region(dev_priv->drm.dev, dsm->start + 1,
|
|
|
|
resource_size(dsm) - 2,
|
2014-01-13 10:55:21 +00:00
|
|
|
"Graphics Stolen Memory");
|
2014-04-11 13:55:17 +00:00
|
|
|
/*
|
|
|
|
* GEN3 firmware likes to smash pci bridges into the stolen
|
|
|
|
* range. Apparently this works.
|
|
|
|
*/
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
if (r == NULL && !IS_GEN(dev_priv, 3)) {
|
2017-12-11 15:18:18 +00:00
|
|
|
DRM_ERROR("conflict detected with stolen region: %pR\n",
|
|
|
|
dsm);
|
2017-01-26 20:19:07 +00:00
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
return -EBUSY;
|
2014-01-13 10:55:21 +00:00
|
|
|
}
|
2013-07-04 11:28:35 +00:00
|
|
|
}
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
return 0;
|
2012-04-24 14:47:39 +00:00
|
|
|
}
|
|
|
|
|
2018-09-20 14:27:07 +00:00
|
|
|
void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv)
|
2012-04-24 14:47:39 +00:00
|
|
|
{
|
2013-07-02 08:48:31 +00:00
|
|
|
if (!drm_mm_initialized(&dev_priv->mm.stolen))
|
|
|
|
return;
|
|
|
|
|
2012-12-18 14:24:37 +00:00
|
|
|
drm_mm_takedown(&dev_priv->mm.stolen);
|
2012-04-24 14:47:39 +00:00
|
|
|
}
|
|
|
|
|
2015-09-16 18:28:50 +00:00
|
|
|
static void g4x_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
2018-03-12 16:52:05 +00:00
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
2015-09-16 18:28:50 +00:00
|
|
|
{
|
2018-03-12 16:52:05 +00:00
|
|
|
u32 reg_val = I915_READ(IS_GM45(dev_priv) ?
|
|
|
|
CTG_STOLEN_RESERVED :
|
|
|
|
ELK_STOLEN_RESERVED);
|
2017-12-11 15:18:22 +00:00
|
|
|
resource_size_t stolen_top = dev_priv->dsm.end + 1;
|
2015-09-16 18:28:50 +00:00
|
|
|
|
2018-03-12 16:52:05 +00:00
|
|
|
DRM_DEBUG_DRIVER("%s_STOLEN_RESERVED = %08x\n",
|
|
|
|
IS_GM45(dev_priv) ? "CTG" : "ELK", reg_val);
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if ((reg_val & G4X_STOLEN_RESERVED_ENABLE) == 0)
|
2017-11-02 15:17:35 +00:00
|
|
|
return;
|
|
|
|
|
2017-11-02 15:17:37 +00:00
|
|
|
/*
|
|
|
|
* Whether ILK really reuses the ELK register for this is unclear.
|
|
|
|
* Let's see if we catch anyone with this supposedly enabled on ILK.
|
|
|
|
*/
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-12 18:10:43 +00:00
|
|
|
WARN(IS_GEN(dev_priv, 5), "ILK stolen reserved found? 0x%08x\n",
|
|
|
|
reg_val);
|
2017-11-02 15:17:37 +00:00
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & G4X_STOLEN_RESERVED_ADDR2_MASK))
|
|
|
|
return;
|
2015-09-16 18:28:50 +00:00
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
*base = (reg_val & G4X_STOLEN_RESERVED_ADDR2_MASK) << 16;
|
2015-09-16 18:28:50 +00:00
|
|
|
WARN_ON((reg_val & G4X_STOLEN_RESERVED_ADDR1_MASK) < *base);
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
*size = stolen_top - *base;
|
2015-09-16 18:28:50 +00:00
|
|
|
}
|
|
|
|
|
2015-08-10 17:57:32 +00:00
|
|
|
static void gen6_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
2018-03-12 16:52:05 +00:00
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
2015-08-10 17:57:32 +00:00
|
|
|
{
|
2018-03-12 16:52:05 +00:00
|
|
|
u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
|
2015-08-10 17:57:32 +00:00
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ENABLE))
|
2017-11-02 15:17:35 +00:00
|
|
|
return;
|
|
|
|
|
2015-08-10 17:57:32 +00:00
|
|
|
*base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
|
|
|
|
|
|
|
switch (reg_val & GEN6_STOLEN_RESERVED_SIZE_MASK) {
|
|
|
|
case GEN6_STOLEN_RESERVED_1M:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN6_STOLEN_RESERVED_512K:
|
|
|
|
*size = 512 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN6_STOLEN_RESERVED_256K:
|
|
|
|
*size = 256 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN6_STOLEN_RESERVED_128K:
|
|
|
|
*size = 128 * 1024;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
MISSING_CASE(reg_val & GEN6_STOLEN_RESERVED_SIZE_MASK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
static void vlv_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
|
|
|
{
|
|
|
|
u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
|
|
|
resource_size_t stolen_top = dev_priv->dsm.end + 1;
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
|
|
|
|
|
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ENABLE))
|
|
|
|
return;
|
|
|
|
|
|
|
|
switch (reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK) {
|
|
|
|
default:
|
|
|
|
MISSING_CASE(reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK);
|
2018-06-28 22:35:41 +00:00
|
|
|
/* fall through */
|
2018-03-12 16:52:06 +00:00
|
|
|
case GEN7_STOLEN_RESERVED_1M:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* On vlv, the ADDR_MASK portion is left as 0 and HW deduces the
|
|
|
|
* reserved location as (top - size).
|
|
|
|
*/
|
|
|
|
*base = stolen_top - *size;
|
|
|
|
}
|
|
|
|
|
2015-08-10 17:57:32 +00:00
|
|
|
static void gen7_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
2018-03-12 16:52:05 +00:00
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
2015-08-10 17:57:32 +00:00
|
|
|
{
|
2018-03-12 16:52:05 +00:00
|
|
|
u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
|
2015-08-10 17:57:32 +00:00
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ENABLE))
|
2017-11-02 15:17:35 +00:00
|
|
|
return;
|
|
|
|
|
2015-08-10 17:57:32 +00:00
|
|
|
*base = reg_val & GEN7_STOLEN_RESERVED_ADDR_MASK;
|
|
|
|
|
|
|
|
switch (reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK) {
|
|
|
|
case GEN7_STOLEN_RESERVED_1M:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN7_STOLEN_RESERVED_256K:
|
|
|
|
*size = 256 * 1024;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
MISSING_CASE(reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-18 21:36:27 +00:00
|
|
|
static void chv_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
2018-03-12 16:52:05 +00:00
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
2015-08-10 17:57:32 +00:00
|
|
|
{
|
2018-03-12 16:52:05 +00:00
|
|
|
u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
|
2015-08-10 17:57:32 +00:00
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ENABLE))
|
2017-11-02 15:17:35 +00:00
|
|
|
return;
|
|
|
|
|
2015-08-10 17:57:32 +00:00
|
|
|
*base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
|
|
|
|
|
|
|
switch (reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK) {
|
|
|
|
case GEN8_STOLEN_RESERVED_1M:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_2M:
|
|
|
|
*size = 2 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_4M:
|
|
|
|
*size = 4 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_8M:
|
|
|
|
*size = 8 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*size = 8 * 1024 * 1024;
|
|
|
|
MISSING_CASE(reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void bdw_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
2018-03-12 16:52:05 +00:00
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
2015-08-10 17:57:32 +00:00
|
|
|
{
|
2018-03-12 16:52:05 +00:00
|
|
|
u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
2018-03-12 16:52:06 +00:00
|
|
|
resource_size_t stolen_top = dev_priv->dsm.end + 1;
|
2015-08-10 17:57:32 +00:00
|
|
|
|
2018-03-12 16:52:05 +00:00
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ENABLE))
|
2017-11-02 15:17:35 +00:00
|
|
|
return;
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
if (!(reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK))
|
|
|
|
return;
|
2015-08-10 17:57:32 +00:00
|
|
|
|
|
|
|
*base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
2018-03-12 16:52:06 +00:00
|
|
|
*size = stolen_top - *base;
|
2015-08-10 17:57:32 +00:00
|
|
|
}
|
|
|
|
|
2018-05-04 20:32:52 +00:00
|
|
|
static void icl_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
|
|
|
resource_size_t *base,
|
|
|
|
resource_size_t *size)
|
|
|
|
{
|
|
|
|
u64 reg_val = I915_READ64(GEN6_STOLEN_RESERVED);
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = 0x%016llx\n", reg_val);
|
|
|
|
|
|
|
|
*base = reg_val & GEN11_STOLEN_RESERVED_ADDR_MASK;
|
|
|
|
|
|
|
|
switch (reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK) {
|
|
|
|
case GEN8_STOLEN_RESERVED_1M:
|
|
|
|
*size = 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_2M:
|
|
|
|
*size = 2 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_4M:
|
|
|
|
*size = 4 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
case GEN8_STOLEN_RESERVED_8M:
|
|
|
|
*size = 8 * 1024 * 1024;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*size = 8 * 1024 * 1024;
|
|
|
|
MISSING_CASE(reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-16 08:55:35 +00:00
|
|
|
int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
|
2012-04-24 14:47:39 +00:00
|
|
|
{
|
2017-12-11 15:18:22 +00:00
|
|
|
resource_size_t reserved_base, stolen_top;
|
|
|
|
resource_size_t reserved_total, reserved_size;
|
2012-04-24 14:47:39 +00:00
|
|
|
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_init(&dev_priv->mm.stolen_lock);
|
|
|
|
|
2016-11-09 10:39:05 +00:00
|
|
|
if (intel_vgpu_active(dev_priv)) {
|
|
|
|
DRM_INFO("iGVT-g active, disabling use of stolen memory\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-25 12:16:12 +00:00
|
|
|
if (intel_vtd_active() && INTEL_GEN(dev_priv) < 8) {
|
2014-03-18 12:50:50 +00:00
|
|
|
DRM_INFO("DMAR active, disabling use of stolen memory\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
if (resource_size(&intel_graphics_stolen_res) == 0)
|
2013-09-05 12:40:25 +00:00
|
|
|
return 0;
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
dev_priv->dsm = intel_graphics_stolen_res;
|
|
|
|
|
|
|
|
if (i915_adjust_stolen(dev_priv, &dev_priv->dsm))
|
2012-11-15 11:32:18 +00:00
|
|
|
return 0;
|
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
GEM_BUG_ON(dev_priv->dsm.start == 0);
|
|
|
|
GEM_BUG_ON(dev_priv->dsm.end <= dev_priv->dsm.start);
|
|
|
|
|
|
|
|
stolen_top = dev_priv->dsm.end + 1;
|
2018-03-12 16:52:06 +00:00
|
|
|
reserved_base = stolen_top;
|
2017-01-06 15:20:10 +00:00
|
|
|
reserved_size = 0;
|
2015-08-10 17:57:32 +00:00
|
|
|
|
2018-02-09 21:58:46 +00:00
|
|
|
switch (INTEL_GEN(dev_priv)) {
|
2015-08-10 17:57:32 +00:00
|
|
|
case 2:
|
|
|
|
case 3:
|
2015-09-16 18:28:50 +00:00
|
|
|
break;
|
2015-08-10 17:57:32 +00:00
|
|
|
case 4:
|
2017-11-02 15:17:37 +00:00
|
|
|
if (!IS_G4X(dev_priv))
|
|
|
|
break;
|
|
|
|
/* fall through */
|
2015-08-10 17:57:32 +00:00
|
|
|
case 5:
|
2017-11-02 15:17:37 +00:00
|
|
|
g4x_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
break;
|
|
|
|
case 6:
|
2017-01-06 15:20:10 +00:00
|
|
|
gen6_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
break;
|
|
|
|
case 7:
|
2018-03-12 16:52:06 +00:00
|
|
|
if (IS_VALLEYVIEW(dev_priv))
|
|
|
|
vlv_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
|
|
|
else
|
|
|
|
gen7_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
break;
|
2018-05-04 20:32:52 +00:00
|
|
|
case 8:
|
|
|
|
case 9:
|
|
|
|
case 10:
|
2016-12-19 19:05:47 +00:00
|
|
|
if (IS_LP(dev_priv))
|
2017-01-06 15:20:10 +00:00
|
|
|
chv_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
else
|
2017-01-06 15:20:10 +00:00
|
|
|
bdw_get_stolen_reserved(dev_priv,
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
break;
|
2018-05-04 20:32:52 +00:00
|
|
|
case 11:
|
|
|
|
default:
|
|
|
|
icl_get_stolen_reserved(dev_priv, &reserved_base,
|
|
|
|
&reserved_size);
|
|
|
|
break;
|
2015-08-10 17:57:32 +00:00
|
|
|
}
|
|
|
|
|
2018-03-12 16:52:06 +00:00
|
|
|
/*
|
|
|
|
* Our expectation is that the reserved space is at the top of the
|
|
|
|
* stolen region and *never* at the bottom. If we see !reserved_base,
|
|
|
|
* it likely means we failed to read the registers correctly.
|
|
|
|
*/
|
|
|
|
if (!reserved_base) {
|
|
|
|
DRM_ERROR("inconsistent reservation %pa + %pa; ignoring\n",
|
|
|
|
&reserved_base, &reserved_size);
|
2015-08-10 17:57:32 +00:00
|
|
|
reserved_base = stolen_top;
|
2018-03-12 16:52:06 +00:00
|
|
|
reserved_size = 0;
|
2014-09-11 11:28:08 +00:00
|
|
|
}
|
2013-05-08 17:45:13 +00:00
|
|
|
|
2017-12-11 15:18:19 +00:00
|
|
|
dev_priv->dsm_reserved =
|
|
|
|
(struct resource) DEFINE_RES_MEM(reserved_base, reserved_size);
|
|
|
|
|
|
|
|
if (!resource_contains(&dev_priv->dsm, &dev_priv->dsm_reserved)) {
|
|
|
|
DRM_ERROR("Stolen reserved area %pR outside stolen memory %pR\n",
|
|
|
|
&dev_priv->dsm_reserved, &dev_priv->dsm);
|
2013-07-09 12:44:27 +00:00
|
|
|
return 0;
|
2015-08-10 17:57:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* It is possible for the reserved area to end before the end of stolen
|
|
|
|
* memory, so just consider the start. */
|
|
|
|
reserved_total = stolen_top - reserved_base;
|
|
|
|
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("Memory reserved for graphics device: %lluK, usable: %lluK\n",
|
|
|
|
(u64)resource_size(&dev_priv->dsm) >> 10,
|
|
|
|
((u64)resource_size(&dev_priv->dsm) - reserved_total) >> 10);
|
2013-07-09 12:44:27 +00:00
|
|
|
|
2017-12-11 15:18:21 +00:00
|
|
|
dev_priv->stolen_usable_size =
|
drm/i915: Do NOT skip the first 4k of stolen memory for pre-allocated buffers v2
Before this commit the WaSkipStolenMemoryFirstPage workaround code was
skipping the first 4k by passing 4096 as start of the address range passed
to drm_mm_init(). This means that calling drm_mm_reserve_node() to try and
reserve the firmware framebuffer so that we can inherit it would always
fail, as the firmware framebuffer starts at address 0.
Commit d43537610470 ("drm/i915: skip the first 4k of stolen memory on
everything >= gen8") says in its commit message: "This is confirmed to fix
Skylake screen flickering issues (probably caused by the fact that we
initialized a ring in the first page of stolen, but I didn't 100% confirm
this theory)."
Which suggests that it is safe to use the first page for a linear
framebuffer as the firmware is doing (see note below).
This commit always passes 0 as start to drm_mm_init() and works around
WaSkipStolenMemoryFirstPage in i915_gem_stolen_insert_node_in_range()
by insuring the start address passed by to drm_mm_insert_node_in_range()
is always 4k or more. All entry points to i915_gem_stolen.c go through
i915_gem_stolen_insert_node_in_range(), so that any newly allocated
objects such as ring-buffers will not be allocated in the first 4k.
The one exception is i915_gem_object_create_stolen_for_preallocated()
which directly calls drm_mm_reserve_node() which now will be able to
use the first 4k.
This fixes the i915 driver no longer being able to inherit the firmware
framebuffer on gen8+, which fixes the video output changing from the
vendor logo to a black screen as soon as the i915 driver is loaded
(on systems without fbcon).
Some notes about the mapping of the BIOS framebuffer:
v1 led to some discussion if the assumption of the intel_display.c code
that the firmware framebuffer is a linear mapping of the stolen memory
starting at offset 0 is still correct, because that would mean that the
GOP does not implement the WaSkipStolenMemoryFirstPage workaround.
To verify this the following code was added at the end of
i915_gem_object_create_stolen_for_preallocated() :
pr_err("first ggtt entry before bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
ret = i915_vma_bind(vma,
HAS_LLC(dev_priv) ? I915_CACHE_LLC : I915_CACHE_NONE,
PIN_UPDATE);
pr_err("i915_vma_bind ret %d\n", ret);
pr_err("first ggtt entry after bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
Which prints the mapping of the first page, then does a vma_bind() to
force update the mapping with our linear view of the framebuffer and
then prints the mapping of the first page again.
On an Asrock B150M Pro4S/D3 mainboard with i5-6500 CPU this prints:
[ 1.651141] first ggtt entry before bind: 0x0000000078c00001
[ 1.651151] i915_vma_bind ret 0
[ 1.651152] first ggtt entry after bind: 0x0000000078c00083
And "sudo cat /proc/iomem | grep Stolen" gives:
78c00000-88bfffff : Graphics Stolen Memory
There are no visual changes with this patch (BIOS vendor logo still
stays in place when we inherit the BIOS framebuffer), so the vma_bind()
does not impact which memory is being scanned out.
The address of the first ggtt entry matches with the start of stolen
and the i915_vma_bind call only changes the first gtt entry's flags,
or-ing in _PAGE_RW (BIT(1)) and PPAT_CACHED (BIT(7)), which perfectly
matches what we would expect based on gen8_pte_encode()'s behavior.
So it seems that the GOP indeed does NOT implement the wa and the i915's
code assuming a linear mapping at the start of stolen for the BIOS fb
still holds true for gen8+.
I've also tested this on a Cherry Trail based device (a GPD Win)
with identical results (the flags are 0x1b after the vma_bind
on CHT, which matches with I915_CACHE_NONE).
Changed in v2: No code changes, extended the commit message with the
verification that the intel_display.c BIOS framebuffer mapping is still
correct.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180420095933.16442-1-hdegoede@redhat.com
2018-04-20 09:59:33 +00:00
|
|
|
resource_size(&dev_priv->dsm) - reserved_total;
|
2016-12-15 13:23:55 +00:00
|
|
|
|
|
|
|
/* Basic memrange allocator for stolen space. */
|
drm/i915: Do NOT skip the first 4k of stolen memory for pre-allocated buffers v2
Before this commit the WaSkipStolenMemoryFirstPage workaround code was
skipping the first 4k by passing 4096 as start of the address range passed
to drm_mm_init(). This means that calling drm_mm_reserve_node() to try and
reserve the firmware framebuffer so that we can inherit it would always
fail, as the firmware framebuffer starts at address 0.
Commit d43537610470 ("drm/i915: skip the first 4k of stolen memory on
everything >= gen8") says in its commit message: "This is confirmed to fix
Skylake screen flickering issues (probably caused by the fact that we
initialized a ring in the first page of stolen, but I didn't 100% confirm
this theory)."
Which suggests that it is safe to use the first page for a linear
framebuffer as the firmware is doing (see note below).
This commit always passes 0 as start to drm_mm_init() and works around
WaSkipStolenMemoryFirstPage in i915_gem_stolen_insert_node_in_range()
by insuring the start address passed by to drm_mm_insert_node_in_range()
is always 4k or more. All entry points to i915_gem_stolen.c go through
i915_gem_stolen_insert_node_in_range(), so that any newly allocated
objects such as ring-buffers will not be allocated in the first 4k.
The one exception is i915_gem_object_create_stolen_for_preallocated()
which directly calls drm_mm_reserve_node() which now will be able to
use the first 4k.
This fixes the i915 driver no longer being able to inherit the firmware
framebuffer on gen8+, which fixes the video output changing from the
vendor logo to a black screen as soon as the i915 driver is loaded
(on systems without fbcon).
Some notes about the mapping of the BIOS framebuffer:
v1 led to some discussion if the assumption of the intel_display.c code
that the firmware framebuffer is a linear mapping of the stolen memory
starting at offset 0 is still correct, because that would mean that the
GOP does not implement the WaSkipStolenMemoryFirstPage workaround.
To verify this the following code was added at the end of
i915_gem_object_create_stolen_for_preallocated() :
pr_err("first ggtt entry before bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
ret = i915_vma_bind(vma,
HAS_LLC(dev_priv) ? I915_CACHE_LLC : I915_CACHE_NONE,
PIN_UPDATE);
pr_err("i915_vma_bind ret %d\n", ret);
pr_err("first ggtt entry after bind: 0x%016llx\n",
readq(dev_priv->ggtt.gsm));
Which prints the mapping of the first page, then does a vma_bind() to
force update the mapping with our linear view of the framebuffer and
then prints the mapping of the first page again.
On an Asrock B150M Pro4S/D3 mainboard with i5-6500 CPU this prints:
[ 1.651141] first ggtt entry before bind: 0x0000000078c00001
[ 1.651151] i915_vma_bind ret 0
[ 1.651152] first ggtt entry after bind: 0x0000000078c00083
And "sudo cat /proc/iomem | grep Stolen" gives:
78c00000-88bfffff : Graphics Stolen Memory
There are no visual changes with this patch (BIOS vendor logo still
stays in place when we inherit the BIOS framebuffer), so the vma_bind()
does not impact which memory is being scanned out.
The address of the first ggtt entry matches with the start of stolen
and the i915_vma_bind call only changes the first gtt entry's flags,
or-ing in _PAGE_RW (BIT(1)) and PPAT_CACHED (BIT(7)), which perfectly
matches what we would expect based on gen8_pte_encode()'s behavior.
So it seems that the GOP indeed does NOT implement the wa and the i915's
code assuming a linear mapping at the start of stolen for the BIOS fb
still holds true for gen8+.
I've also tested this on a Cherry Trail based device (a GPD Win)
with identical results (the flags are 0x1b after the vma_bind
on CHT, which matches with I915_CACHE_NONE).
Changed in v2: No code changes, extended the commit message with the
verification that the intel_display.c BIOS framebuffer mapping is still
correct.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180420095933.16442-1-hdegoede@redhat.com
2018-04-20 09:59:33 +00:00
|
|
|
drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->stolen_usable_size);
|
2012-04-24 14:47:39 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2012-11-15 11:32:26 +00:00
|
|
|
|
|
|
|
static struct sg_table *
|
|
|
|
i915_pages_create_for_stolen(struct drm_device *dev,
|
2017-12-11 15:18:22 +00:00
|
|
|
resource_size_t offset, resource_size_t size)
|
2012-11-15 11:32:26 +00:00
|
|
|
{
|
2016-03-30 13:57:10 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-11-15 11:32:26 +00:00
|
|
|
struct sg_table *st;
|
|
|
|
struct scatterlist *sg;
|
|
|
|
|
2017-12-11 15:18:22 +00:00
|
|
|
GEM_BUG_ON(range_overflows(offset, size, resource_size(&dev_priv->dsm)));
|
2012-11-15 11:32:26 +00:00
|
|
|
|
|
|
|
/* We hide that we have no struct page backing our stolen object
|
|
|
|
* by wrapping the contiguous physical allocation with a fake
|
|
|
|
* dma mapping in a single scatterlist.
|
|
|
|
*/
|
|
|
|
|
|
|
|
st = kmalloc(sizeof(*st), GFP_KERNEL);
|
|
|
|
if (st == NULL)
|
2016-11-18 17:02:16 +00:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2012-11-15 11:32:26 +00:00
|
|
|
|
|
|
|
if (sg_alloc_table(st, 1, GFP_KERNEL)) {
|
|
|
|
kfree(st);
|
2016-11-18 17:02:16 +00:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2012-11-15 11:32:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sg = st->sgl;
|
2014-01-13 10:54:45 +00:00
|
|
|
sg->offset = 0;
|
2013-03-26 13:14:19 +00:00
|
|
|
sg->length = size;
|
2012-11-15 11:32:26 +00:00
|
|
|
|
2017-12-11 15:18:18 +00:00
|
|
|
sg_dma_address(sg) = (dma_addr_t)dev_priv->dsm.start + offset;
|
2012-11-15 11:32:26 +00:00
|
|
|
sg_dma_len(sg) = size;
|
|
|
|
|
|
|
|
return st;
|
|
|
|
}
|
|
|
|
|
2017-10-06 22:18:17 +00:00
|
|
|
static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj)
|
2012-11-15 11:32:26 +00:00
|
|
|
{
|
2017-10-06 22:18:17 +00:00
|
|
|
struct sg_table *pages =
|
|
|
|
i915_pages_create_for_stolen(obj->base.dev,
|
|
|
|
obj->stolen->start,
|
|
|
|
obj->stolen->size);
|
|
|
|
if (IS_ERR(pages))
|
|
|
|
return PTR_ERR(pages);
|
|
|
|
|
2017-10-06 22:18:18 +00:00
|
|
|
__i915_gem_object_set_pages(obj, pages, obj->stolen->size);
|
2017-10-06 22:18:17 +00:00
|
|
|
|
|
|
|
return 0;
|
2012-11-15 11:32:26 +00:00
|
|
|
}
|
|
|
|
|
2016-10-28 12:58:36 +00:00
|
|
|
static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj,
|
|
|
|
struct sg_table *pages)
|
2012-11-15 11:32:26 +00:00
|
|
|
{
|
2016-11-17 15:58:46 +00:00
|
|
|
/* Should only be called from i915_gem_object_release_stolen() */
|
2016-10-28 12:58:36 +00:00
|
|
|
sg_free_table(pages);
|
|
|
|
kfree(pages);
|
2012-11-15 11:32:26 +00:00
|
|
|
}
|
|
|
|
|
2014-06-06 09:22:54 +00:00
|
|
|
static void
|
|
|
|
i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
|
2016-11-17 15:58:46 +00:00
|
|
|
struct drm_mm_node *stolen = fetch_and_zero(&obj->stolen);
|
|
|
|
|
|
|
|
GEM_BUG_ON(!stolen);
|
2015-07-02 22:25:07 +00:00
|
|
|
|
2016-10-28 12:58:35 +00:00
|
|
|
__i915_gem_object_unpin_pages(obj);
|
|
|
|
|
2016-11-17 15:58:46 +00:00
|
|
|
i915_gem_stolen_remove_node(dev_priv, stolen);
|
|
|
|
kfree(stolen);
|
2014-06-06 09:22:54 +00:00
|
|
|
}
|
2016-11-17 15:58:46 +00:00
|
|
|
|
2012-11-15 11:32:26 +00:00
|
|
|
static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {
|
|
|
|
.get_pages = i915_gem_object_get_pages_stolen,
|
|
|
|
.put_pages = i915_gem_object_put_pages_stolen,
|
2014-06-06 09:22:54 +00:00
|
|
|
.release = i915_gem_object_release_stolen,
|
2012-11-15 11:32:26 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct drm_i915_gem_object *
|
2016-12-01 14:16:36 +00:00
|
|
|
_i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
|
2012-11-15 11:32:26 +00:00
|
|
|
struct drm_mm_node *stolen)
|
|
|
|
{
|
|
|
|
struct drm_i915_gem_object *obj;
|
2017-08-11 11:11:16 +00:00
|
|
|
unsigned int cache_level;
|
2012-11-15 11:32:26 +00:00
|
|
|
|
2019-02-28 10:20:34 +00:00
|
|
|
obj = i915_gem_object_alloc();
|
2012-11-15 11:32:26 +00:00
|
|
|
if (obj == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2016-12-01 14:16:36 +00:00
|
|
|
drm_gem_private_object_init(&dev_priv->drm, &obj->base, stolen->size);
|
2012-11-15 11:32:26 +00:00
|
|
|
i915_gem_object_init(obj, &i915_gem_object_stolen_ops);
|
|
|
|
|
|
|
|
obj->stolen = stolen;
|
2018-02-16 12:43:38 +00:00
|
|
|
obj->read_domains = I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT;
|
2017-08-11 11:11:16 +00:00
|
|
|
cache_level = HAS_LLC(dev_priv) ? I915_CACHE_LLC : I915_CACHE_NONE;
|
|
|
|
i915_gem_object_set_cache_coherency(obj, cache_level);
|
2012-11-15 11:32:26 +00:00
|
|
|
|
2016-10-28 12:58:36 +00:00
|
|
|
if (i915_gem_object_pin_pages(obj))
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-11-15 11:32:26 +00:00
|
|
|
return obj;
|
|
|
|
|
|
|
|
cleanup:
|
2012-11-15 11:32:30 +00:00
|
|
|
i915_gem_object_free(obj);
|
2012-11-15 11:32:26 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct drm_i915_gem_object *
|
2017-12-11 15:18:22 +00:00
|
|
|
i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
|
|
|
|
resource_size_t size)
|
2012-11-15 11:32:26 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
struct drm_mm_node *stolen;
|
2013-07-27 14:21:27 +00:00
|
|
|
int ret;
|
2012-11-15 11:32:26 +00:00
|
|
|
|
2013-07-02 08:48:31 +00:00
|
|
|
if (!drm_mm_initialized(&dev_priv->mm.stolen))
|
2012-11-15 11:32:26 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (size == 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-07-27 14:21:27 +00:00
|
|
|
stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
|
|
|
|
if (!stolen)
|
2012-11-15 11:32:26 +00:00
|
|
|
return NULL;
|
|
|
|
|
2015-07-02 22:25:07 +00:00
|
|
|
ret = i915_gem_stolen_insert_node(dev_priv, stolen, size, 4096);
|
2013-07-27 14:21:27 +00:00
|
|
|
if (ret) {
|
|
|
|
kfree(stolen);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-12-01 14:16:36 +00:00
|
|
|
obj = _i915_gem_object_create_stolen(dev_priv, stolen);
|
2012-11-15 11:32:26 +00:00
|
|
|
if (obj)
|
|
|
|
return obj;
|
|
|
|
|
2015-07-02 22:25:07 +00:00
|
|
|
i915_gem_stolen_remove_node(dev_priv, stolen);
|
2013-07-27 14:21:27 +00:00
|
|
|
kfree(stolen);
|
2012-11-15 11:32:26 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-02-19 21:31:37 +00:00
|
|
|
struct drm_i915_gem_object *
|
2016-12-01 14:16:36 +00:00
|
|
|
i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,
|
2017-12-11 15:18:22 +00:00
|
|
|
resource_size_t stolen_offset,
|
|
|
|
resource_size_t gtt_offset,
|
|
|
|
resource_size_t size)
|
2013-02-19 21:31:37 +00:00
|
|
|
{
|
2016-03-30 13:57:10 +00:00
|
|
|
struct i915_ggtt *ggtt = &dev_priv->ggtt;
|
2013-02-19 21:31:37 +00:00
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
struct drm_mm_node *stolen;
|
2013-07-17 19:19:03 +00:00
|
|
|
struct i915_vma *vma;
|
2013-07-05 21:41:02 +00:00
|
|
|
int ret;
|
2013-02-19 21:31:37 +00:00
|
|
|
|
2013-07-02 08:48:31 +00:00
|
|
|
if (!drm_mm_initialized(&dev_priv->mm.stolen))
|
2013-02-19 21:31:37 +00:00
|
|
|
return NULL;
|
|
|
|
|
2016-12-01 14:16:36 +00:00
|
|
|
lockdep_assert_held(&dev_priv->drm.struct_mutex);
|
2016-02-11 10:27:29 +00:00
|
|
|
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("creating preallocated stolen object: stolen_offset=%pa, gtt_offset=%pa, size=%pa\n",
|
|
|
|
&stolen_offset, >t_offset, &size);
|
2013-02-19 21:31:37 +00:00
|
|
|
|
|
|
|
/* KISS and expect everything to be page-aligned */
|
2017-01-10 14:47:34 +00:00
|
|
|
if (WARN_ON(size == 0) ||
|
|
|
|
WARN_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE)) ||
|
|
|
|
WARN_ON(!IS_ALIGNED(stolen_offset, I915_GTT_MIN_ALIGNMENT)))
|
2013-02-19 21:31:37 +00:00
|
|
|
return NULL;
|
|
|
|
|
2013-07-05 21:41:02 +00:00
|
|
|
stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
|
|
|
|
if (!stolen)
|
|
|
|
return NULL;
|
|
|
|
|
2013-07-05 21:41:03 +00:00
|
|
|
stolen->start = stolen_offset;
|
|
|
|
stolen->size = size;
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_lock(&dev_priv->mm.stolen_lock);
|
2013-07-05 21:41:03 +00:00
|
|
|
ret = drm_mm_reserve_node(&dev_priv->mm.stolen, stolen);
|
2015-07-02 22:25:09 +00:00
|
|
|
mutex_unlock(&dev_priv->mm.stolen_lock);
|
2013-07-05 21:41:02 +00:00
|
|
|
if (ret) {
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("failed to allocate stolen space\n");
|
2013-07-05 21:41:02 +00:00
|
|
|
kfree(stolen);
|
2013-02-19 21:31:37 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-12-01 14:16:36 +00:00
|
|
|
obj = _i915_gem_object_create_stolen(dev_priv, stolen);
|
2013-02-19 21:31:37 +00:00
|
|
|
if (obj == NULL) {
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("failed to allocate stolen object\n");
|
2015-07-02 22:25:07 +00:00
|
|
|
i915_gem_stolen_remove_node(dev_priv, stolen);
|
2013-07-27 14:21:27 +00:00
|
|
|
kfree(stolen);
|
2013-02-19 21:31:37 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-05-08 17:45:14 +00:00
|
|
|
/* Some objects just need physical mem from stolen space */
|
2013-07-04 11:06:28 +00:00
|
|
|
if (gtt_offset == I915_GTT_OFFSET_NONE)
|
2013-05-08 17:45:14 +00:00
|
|
|
return obj;
|
|
|
|
|
2016-10-28 12:58:36 +00:00
|
|
|
ret = i915_gem_object_pin_pages(obj);
|
|
|
|
if (ret)
|
|
|
|
goto err;
|
|
|
|
|
2018-06-05 15:37:58 +00:00
|
|
|
vma = i915_vma_instance(obj, &ggtt->vm, NULL);
|
2013-07-19 05:45:46 +00:00
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
ret = PTR_ERR(vma);
|
2016-10-28 12:58:36 +00:00
|
|
|
goto err_pages;
|
2013-07-17 19:19:03 +00:00
|
|
|
}
|
|
|
|
|
2013-02-19 21:31:37 +00:00
|
|
|
/* To simplify the initialisation sequence between KMS and GTT,
|
|
|
|
* we allow construction of the stolen object prior to
|
|
|
|
* setting up the GTT space. The actual reservation will occur
|
|
|
|
* later.
|
|
|
|
*/
|
2018-06-05 15:37:58 +00:00
|
|
|
ret = i915_gem_gtt_reserve(&ggtt->vm, &vma->node,
|
2017-01-11 11:23:11 +00:00
|
|
|
size, gtt_offset, obj->cache_level,
|
|
|
|
0);
|
2016-08-04 06:52:23 +00:00
|
|
|
if (ret) {
|
2018-03-12 16:52:04 +00:00
|
|
|
DRM_DEBUG_DRIVER("failed to allocate stolen GTT space\n");
|
2016-10-28 12:58:36 +00:00
|
|
|
goto err_pages;
|
2015-09-24 10:57:45 +00:00
|
|
|
}
|
2013-02-19 21:31:37 +00:00
|
|
|
|
2017-01-19 19:26:58 +00:00
|
|
|
GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));
|
|
|
|
|
2016-10-28 12:58:35 +00:00
|
|
|
vma->pages = obj->mm.pages;
|
2016-08-04 15:32:32 +00:00
|
|
|
vma->flags |= I915_VMA_GLOBAL_BIND;
|
2016-08-04 06:52:23 +00:00
|
|
|
__i915_vma_set_map_and_fenceable(vma);
|
2019-01-28 10:23:52 +00:00
|
|
|
|
2019-01-28 10:23:53 +00:00
|
|
|
mutex_lock(&ggtt->vm.mutex);
|
2019-01-28 10:23:52 +00:00
|
|
|
list_move_tail(&vma->vm_link, &ggtt->vm.bound_list);
|
2019-01-28 10:23:53 +00:00
|
|
|
mutex_unlock(&ggtt->vm.mutex);
|
2017-10-16 11:40:37 +00:00
|
|
|
|
|
|
|
spin_lock(&dev_priv->mm.obj_lock);
|
|
|
|
list_move_tail(&obj->mm.link, &dev_priv->mm.bound_list);
|
2016-08-04 06:52:26 +00:00
|
|
|
obj->bind_count++;
|
2017-10-16 11:40:37 +00:00
|
|
|
spin_unlock(&dev_priv->mm.obj_lock);
|
2016-08-04 06:52:23 +00:00
|
|
|
|
2013-02-19 21:31:37 +00:00
|
|
|
return obj;
|
2013-07-05 21:41:02 +00:00
|
|
|
|
2016-10-28 12:58:36 +00:00
|
|
|
err_pages:
|
|
|
|
i915_gem_object_unpin_pages(obj);
|
2015-09-24 10:57:45 +00:00
|
|
|
err:
|
2016-07-20 12:31:53 +00:00
|
|
|
i915_gem_object_put(obj);
|
2013-07-05 21:41:02 +00:00
|
|
|
return NULL;
|
2013-02-19 21:31:37 +00:00
|
|
|
}
|