93b694d096
New driver: Cadence MHDP8546 DisplayPort bridge driver core: - cross-driver scatterlist cleanups - devm_drm conversions - remove drm_dev_init - devm_drm_dev_alloc conversion ttm: - lots of refactoring and cleanups bridges: - chained bridge support in more drivers panel: - misc new panels scheduler: - cleanup priority levels displayport: - refactor i915 code into helpers for nouveau i915: - split into display and GT trees - WW locking refactoring in GEM - execbuf2 extension mechanism - syncobj timeline support - GEN 12 HOBL display powersaving - Rocket Lake display additions - Disable FBC on Tigerlake - Tigerlake Type-C + DP improvements - Hotplug interrupt refactoring amdgpu: - Sienna Cichlid updates - Navy Flounder updates - DCE6 (SI) support for DC - Plane rotation enabled - TMZ state info ioctl - PCIe DPC recovery support - DC interrupt handling refactor - OLED panel fixes amdkfd: - add SMI events for thermal throttling - SMI interface events ioctl update - process eviction counters radeon: - move to dma_ for allocations - expose sclk via sysfs msm: - DSI support for sm8150/sm8250 - per-process GPU pagetable support - Displayport support mediatek: - move HDMI phy driver to PHY - convert mtk-dpi to bridge API - disable mt2701 tmds tegra: - bridge support exynos: - misc cleanups vc4: - dual display cleanups ast: - cleanups gma500: - conversion to GPIOd API hisilicon: - misc reworks ingenic: - clock handling and format improvements mcde: - DSI support mgag200: - desktop g200 support mxsfb: - i.MX7 + i.MX8M - alpha plane support panfrost: - devfreq support - amlogic SoC support ps8640: - EDID from eDP retrieval tidss: - AM65xx YUV workaround virtio: - virtio-gpu exported resources rcar-du: - R8A7742, R8A774E1 and R8A77961 support - YUV planar format fixes - non-visible plane handling - VSP device reference count fix - Kconfig fix to avoid displaying disabled options in .config -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJfh579AAoJEAx081l5xIa+GqoP/0amz+ZN7y/L7+f32CRinJ7/ 3e4xjXNDmtWG4Whe/WKjlYmbAcvSdWV/4HYpurW2BFJnOAB/5lIqYcS/PyqErPzA w4EpRoJ+ZdFgmlDH0vdsDwPLT/HFmhUN9AopNkoZpbSMxrManSj5QgmePXyiKReP Q+ZAK5UW5AdOVY4bgXUSEkVq2eilCLXf+bSBR/LrVQuNgu7GULX8SIy/Y1CuMtv8 LgzzjLKfIZaIWC+F/RU7BxJ7YnrVq7z7yXnUx8j2416+k/Wwe+BeSUCSZstT7q9G UkX8jWfR7ZKqhwP+UQeSwDbHkALz7lv88nyjQdxJZ3SrXRe4hy14YjxnR4maeNAj 3TAYSdcAMWyRHqeEZIZ7Hj5sQtTq5OZAoIjxzH3vpVdAnnAkcWoF77pqxV8XPqTC nw40DihAxQOshGwMkjd5DqkEwnMv43Hs1WTVYu9dPTOfOdqPNt+Vqp7Xl9Z46+kV k6PDcx60T9ayDW1QZ6MoIXHta9E7ixzu7gYBL3vP4LuporY0uNG3bzF3CMvof1BK sHYcYTdZkqbTD2d6rHV+TbpPQXgTtlej9qVlQM4SeX37Xtc7LxCYpnpUHKz2S/fK 1vyeGPgdytHblwlxwZOPZ4R2I/HTfnITdr4kMcJHhxAsEewfW1Rd4+stQqVJ2Mph Vz+CFP2BngivGFz5vuky =4H8J -----END PGP SIGNATURE----- Merge tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm Pull drm updates from Dave Airlie: "Not a major amount of change, the i915 trees got split into display and gt trees to better facilitate higher level review, and there's a major refactoring of i915 GEM locking to use more core kernel concepts (like ww-mutexes). msm gets per-process pagetables, older AMD SI cards get DC support, nouveau got a bump in displayport support with common code extraction from i915. Outside of drm this contains a couple of patches for hexint moduleparams which you've acked, and a virtio common code tree that you should also get via it's regular path. New driver: - Cadence MHDP8546 DisplayPort bridge driver core: - cross-driver scatterlist cleanups - devm_drm conversions - remove drm_dev_init - devm_drm_dev_alloc conversion ttm: - lots of refactoring and cleanups bridges: - chained bridge support in more drivers panel: - misc new panels scheduler: - cleanup priority levels displayport: - refactor i915 code into helpers for nouveau i915: - split into display and GT trees - WW locking refactoring in GEM - execbuf2 extension mechanism - syncobj timeline support - GEN 12 HOBL display powersaving - Rocket Lake display additions - Disable FBC on Tigerlake - Tigerlake Type-C + DP improvements - Hotplug interrupt refactoring amdgpu: - Sienna Cichlid updates - Navy Flounder updates - DCE6 (SI) support for DC - Plane rotation enabled - TMZ state info ioctl - PCIe DPC recovery support - DC interrupt handling refactor - OLED panel fixes amdkfd: - add SMI events for thermal throttling - SMI interface events ioctl update - process eviction counters radeon: - move to dma_ for allocations - expose sclk via sysfs msm: - DSI support for sm8150/sm8250 - per-process GPU pagetable support - Displayport support mediatek: - move HDMI phy driver to PHY - convert mtk-dpi to bridge API - disable mt2701 tmds tegra: - bridge support exynos: - misc cleanups vc4: - dual display cleanups ast: - cleanups gma500: - conversion to GPIOd API hisilicon: - misc reworks ingenic: - clock handling and format improvements mcde: - DSI support mgag200: - desktop g200 support mxsfb: - i.MX7 + i.MX8M - alpha plane support panfrost: - devfreq support - amlogic SoC support ps8640: - EDID from eDP retrieval tidss: - AM65xx YUV workaround virtio: - virtio-gpu exported resources rcar-du: - R8A7742, R8A774E1 and R8A77961 support - YUV planar format fixes - non-visible plane handling - VSP device reference count fix - Kconfig fix to avoid displaying disabled options in .config" * tag 'drm-next-2020-10-15' of git://anongit.freedesktop.org/drm/drm: (1494 commits) drm/ingenic: Fix bad revert drm/amdgpu: Fix invalid number of character '{' in amdgpu_acpi_init drm/amdgpu: Remove warning for virtual_display drm/amdgpu: kfd_initialized can be static drm/amd/pm: setup APU dpm clock table in SMU HW initialization drm/amdgpu: prevent spurious warning drm/amdgpu/swsmu: fix ARC build errors drm/amd/display: Fix OPTC_DATA_FORMAT programming drm/amd/display: Don't allow pstate if no support in blank drm/panfrost: increase readl_relaxed_poll_timeout values MAINTAINERS: Update entry for st7703 driver after the rename Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached" drm/amd/display: HDMI remote sink need mode validation for Linux drm/amd/display: Change to correct unit on audio rate drm/amd/display: Avoid set zero in the requested clk drm/amdgpu: align frag_end to covered address space drm/amdgpu: fix NULL pointer dereference for Renoir drm/vmwgfx: fix regression in thp code due to ttm init refactor. drm/amdgpu/swsmu: add interrupt work handler for smu11 parts drm/amdgpu/swsmu: add interrupt work function ...
182 lines
4.4 KiB
C
182 lines
4.4 KiB
C
// SPDX-License-Identifier: GPL-2.0 OR MIT
|
|
/*
|
|
* Huge page-table-entry support for IO memory.
|
|
*
|
|
* Copyright (C) 2007-2019 Vmware, Inc. All rights reservedd.
|
|
*/
|
|
#include "vmwgfx_drv.h"
|
|
#include <drm/ttm/ttm_module.h>
|
|
#include <drm/ttm/ttm_bo_driver.h>
|
|
#include <drm/ttm/ttm_placement.h>
|
|
|
|
/**
|
|
* struct vmw_thp_manager - Range manager implementing huge page alignment
|
|
*
|
|
* @mm: The underlying range manager. Protected by @lock.
|
|
* @lock: Manager lock.
|
|
*/
|
|
struct vmw_thp_manager {
|
|
struct ttm_resource_manager manager;
|
|
struct drm_mm mm;
|
|
spinlock_t lock;
|
|
};
|
|
|
|
static struct vmw_thp_manager *to_thp_manager(struct ttm_resource_manager *man)
|
|
{
|
|
return container_of(man, struct vmw_thp_manager, manager);
|
|
}
|
|
|
|
static const struct ttm_resource_manager_func vmw_thp_func;
|
|
|
|
static int vmw_thp_insert_aligned(struct drm_mm *mm, struct drm_mm_node *node,
|
|
unsigned long align_pages,
|
|
const struct ttm_place *place,
|
|
struct ttm_resource *mem,
|
|
unsigned long lpfn,
|
|
enum drm_mm_insert_mode mode)
|
|
{
|
|
if (align_pages >= mem->page_alignment &&
|
|
(!mem->page_alignment || align_pages % mem->page_alignment == 0)) {
|
|
return drm_mm_insert_node_in_range(mm, node,
|
|
mem->num_pages,
|
|
align_pages, 0,
|
|
place->fpfn, lpfn, mode);
|
|
}
|
|
|
|
return -ENOSPC;
|
|
}
|
|
|
|
static int vmw_thp_get_node(struct ttm_resource_manager *man,
|
|
struct ttm_buffer_object *bo,
|
|
const struct ttm_place *place,
|
|
struct ttm_resource *mem)
|
|
{
|
|
struct vmw_thp_manager *rman = to_thp_manager(man);
|
|
struct drm_mm *mm = &rman->mm;
|
|
struct drm_mm_node *node;
|
|
unsigned long align_pages;
|
|
unsigned long lpfn;
|
|
enum drm_mm_insert_mode mode = DRM_MM_INSERT_BEST;
|
|
int ret;
|
|
|
|
node = kzalloc(sizeof(*node), GFP_KERNEL);
|
|
if (!node)
|
|
return -ENOMEM;
|
|
|
|
lpfn = place->lpfn;
|
|
if (!lpfn)
|
|
lpfn = man->size;
|
|
|
|
mode = DRM_MM_INSERT_BEST;
|
|
if (place->flags & TTM_PL_FLAG_TOPDOWN)
|
|
mode = DRM_MM_INSERT_HIGH;
|
|
|
|
spin_lock(&rman->lock);
|
|
if (IS_ENABLED(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)) {
|
|
align_pages = (HPAGE_PUD_SIZE >> PAGE_SHIFT);
|
|
if (mem->num_pages >= align_pages) {
|
|
ret = vmw_thp_insert_aligned(mm, node, align_pages,
|
|
place, mem, lpfn, mode);
|
|
if (!ret)
|
|
goto found_unlock;
|
|
}
|
|
}
|
|
|
|
align_pages = (HPAGE_PMD_SIZE >> PAGE_SHIFT);
|
|
if (mem->num_pages >= align_pages) {
|
|
ret = vmw_thp_insert_aligned(mm, node, align_pages, place, mem,
|
|
lpfn, mode);
|
|
if (!ret)
|
|
goto found_unlock;
|
|
}
|
|
|
|
ret = drm_mm_insert_node_in_range(mm, node, mem->num_pages,
|
|
mem->page_alignment, 0,
|
|
place->fpfn, lpfn, mode);
|
|
found_unlock:
|
|
spin_unlock(&rman->lock);
|
|
|
|
if (unlikely(ret)) {
|
|
kfree(node);
|
|
} else {
|
|
mem->mm_node = node;
|
|
mem->start = node->start;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
|
|
static void vmw_thp_put_node(struct ttm_resource_manager *man,
|
|
struct ttm_resource *mem)
|
|
{
|
|
struct vmw_thp_manager *rman = to_thp_manager(man);
|
|
|
|
if (mem->mm_node) {
|
|
spin_lock(&rman->lock);
|
|
drm_mm_remove_node(mem->mm_node);
|
|
spin_unlock(&rman->lock);
|
|
|
|
kfree(mem->mm_node);
|
|
mem->mm_node = NULL;
|
|
}
|
|
}
|
|
|
|
int vmw_thp_init(struct vmw_private *dev_priv)
|
|
{
|
|
struct vmw_thp_manager *rman;
|
|
|
|
rman = kzalloc(sizeof(*rman), GFP_KERNEL);
|
|
if (!rman)
|
|
return -ENOMEM;
|
|
|
|
ttm_resource_manager_init(&rman->manager,
|
|
dev_priv->vram_size >> PAGE_SHIFT);
|
|
|
|
rman->manager.func = &vmw_thp_func;
|
|
drm_mm_init(&rman->mm, 0, rman->manager.size);
|
|
spin_lock_init(&rman->lock);
|
|
|
|
ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, &rman->manager);
|
|
ttm_resource_manager_set_used(&rman->manager, true);
|
|
return 0;
|
|
}
|
|
|
|
void vmw_thp_fini(struct vmw_private *dev_priv)
|
|
{
|
|
struct ttm_resource_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
|
|
struct vmw_thp_manager *rman = to_thp_manager(man);
|
|
struct drm_mm *mm = &rman->mm;
|
|
int ret;
|
|
|
|
ttm_resource_manager_set_used(man, false);
|
|
|
|
ret = ttm_resource_manager_force_list_clean(&dev_priv->bdev, man);
|
|
if (ret)
|
|
return;
|
|
spin_lock(&rman->lock);
|
|
drm_mm_clean(mm);
|
|
drm_mm_takedown(mm);
|
|
spin_unlock(&rman->lock);
|
|
ttm_resource_manager_cleanup(man);
|
|
ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, NULL);
|
|
kfree(rman);
|
|
}
|
|
|
|
static void vmw_thp_debug(struct ttm_resource_manager *man,
|
|
struct drm_printer *printer)
|
|
{
|
|
struct vmw_thp_manager *rman = to_thp_manager(man);
|
|
|
|
spin_lock(&rman->lock);
|
|
drm_mm_print(&rman->mm, printer);
|
|
spin_unlock(&rman->lock);
|
|
}
|
|
|
|
static const struct ttm_resource_manager_func vmw_thp_func = {
|
|
.alloc = vmw_thp_get_node,
|
|
.free = vmw_thp_put_node,
|
|
.debug = vmw_thp_debug
|
|
};
|