UAPI Changes: - Fix invalid IN_FORMATS blob when plane->format_mod_supported is NULL. Cross-subsystem Changes: - Assorted dt bindings updates. - Fix vga16fb vga checking on x86. - Fix extra semicolon in rwsem.h's _down_write_nest_lock. - Assorted small fixes to agp and fbdev drivers. - Fix oops in creating a udmabuf with 0 pages. - Hot-unplug firmware fb devices on forced removal - Reqquest memory region in simplefb and simpledrm, and don't make the ioresource as busy. Core Changes: - Mock a drm_plane in drm-plane-helper selftest. - Assorted bug fixes to device logging, dbi. - Use DP helper for sink count in mst. - Assorted documentation fixes. - Assorted small fixes. - Move DP headers to drm/dp, and add a drm dp helper module. - Move the buddy allocator from i915 to common drm. - Add simple pci and platform module init macros to remove a lot of boilerplate from some drivers. - Support microsoft extension for HMDs and specialized monitors. - Improve edid parser's deep color handling. - Add type 7 timing support to edid parser. - Add a weak backpointer to the ttm_bo from ttm_resource - Add 3 eDP panels. Driver Changes: - Add support for HDMI and JZ4780 to ingenic. - Add support for higher DP/eDP bitrates to nouveau. - Assorted driver fixes to tilcdc, vmwgfx, sn65dsi83, meson, stm, panfrost, v3d, gma500, vc4, virtio, mgag200, ast, radeon, amdgpu, nouveau, various bridge drivers. - Convert and revert exynos dsi support to bridge driver. - Add vcc supply regulator support for sn65dsi83. - More conversion of bridge/chipone-icn6211 to atomic. - Remove conflicting fb's from stm, and add support for new hw version. - Add device link in parade-ps8640 to fix suspend/resume. - Update Boe-tv110c9m init sequence. - Add wide screen support to AST2600. - Fix omapdrm implicit dma_buf fencing. - Add support for multiple overlay planes to vkms. - Convert bridge/anx7625 to atomic, add HDCP support, add eld support for audio, and fix HPD. - Add driver for ChromeOS privacy screen. - Handover display from firmware to vc4 more gracefully, and support nomodeset. - Add flexible and ycbcr pixel formats to stm/ltdc. - Convert exynos mipi dsi to atomic. - Add initial dual core group GPUs support to panfrost. - No longer add exclusive fence in amdgpu as shared fence. - Add CSC and full range supoprt to vc4. - Shutdown the display on system shutdown and unbind. - Add Multi-Inno Technology MI0700S4T-6 simple panel. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAmHyiHMACgkQ/lWMcqZw E8OLfQ//Xd1njt93nRGoQofuQkz23n2AUTAnmbwzQKcvmat8ugXbRJ5JaVQJrFpu OQEYM46eZIyu2LekMiz4HgPK8CjS156QJ1WtltUFglOY1KLejb6HF5boBYxLkIC7 wLhkaRiwed4t7WOTrftgzpH5FNj/7Vi+Hav9l8rYRC74sWanEZNGBJL2OD9GRdlU 3tlmY8oXVAN8YDD/43Cv+foOTzLS/COI7JCFgFRhfzoFss3EVR061u55uOq18STB UI29NusqX7/K6hQAWCKl0EQBEZWMR02/dgu3ZpOEHHAa96RgHxIuRYsIO9kvGgiF VyW0EW6AyD/KsOSBYnsfUqkFfNchx9Xb8ZDjIhHUYxPsxe4iUJneCrdIKEmLWgSd 1bVNrltLJKBQARW4Whpy/gaiKV8RD8YVJobA/+/COeCUXCnNAT43O9aJmix/7253 Q7ORXTss5WRpuYswMWmObebf8p3IhFjTvlzzenXynl7mkaohGzHPf6SUSUZbJ8Df PZCh17McwIEQ1BtYeegeAGM6s8lrv5+yZaY4bnkQsJNOHeab0cPqmQ8/s+hUeRtp 3VDRVhkgzz2XuTaiKia0gWcAQbdZ2KornkP4QMyDH7w0+6bsuJnNXe4L1XY9lt4J 5v411FaD61FbGDhu5PFtYI7+ZlgM0h5sqlhVkUEzbckzTF3SC9c= =IMtm -----END PGP SIGNATURE----- Merge tag 'drm-misc-next-2022-01-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next [airlied: add two missing Kconfig] drm-misc-next for v5.18: UAPI Changes: - Fix invalid IN_FORMATS blob when plane->format_mod_supported is NULL. Cross-subsystem Changes: - Assorted dt bindings updates. - Fix vga16fb vga checking on x86. - Fix extra semicolon in rwsem.h's _down_write_nest_lock. - Assorted small fixes to agp and fbdev drivers. - Fix oops in creating a udmabuf with 0 pages. - Hot-unplug firmware fb devices on forced removal - Reqquest memory region in simplefb and simpledrm, and don't make the ioresource as busy. Core Changes: - Mock a drm_plane in drm-plane-helper selftest. - Assorted bug fixes to device logging, dbi. - Use DP helper for sink count in mst. - Assorted documentation fixes. - Assorted small fixes. - Move DP headers to drm/dp, and add a drm dp helper module. - Move the buddy allocator from i915 to common drm. - Add simple pci and platform module init macros to remove a lot of boilerplate from some drivers. - Support microsoft extension for HMDs and specialized monitors. - Improve edid parser's deep color handling. - Add type 7 timing support to edid parser. - Add a weak backpointer to the ttm_bo from ttm_resource - Add 3 eDP panels. Driver Changes: - Add support for HDMI and JZ4780 to ingenic. - Add support for higher DP/eDP bitrates to nouveau. - Assorted driver fixes to tilcdc, vmwgfx, sn65dsi83, meson, stm, panfrost, v3d, gma500, vc4, virtio, mgag200, ast, radeon, amdgpu, nouveau, various bridge drivers. - Convert and revert exynos dsi support to bridge driver. - Add vcc supply regulator support for sn65dsi83. - More conversion of bridge/chipone-icn6211 to atomic. - Remove conflicting fb's from stm, and add support for new hw version. - Add device link in parade-ps8640 to fix suspend/resume. - Update Boe-tv110c9m init sequence. - Add wide screen support to AST2600. - Fix omapdrm implicit dma_buf fencing. - Add support for multiple overlay planes to vkms. - Convert bridge/anx7625 to atomic, add HDCP support, add eld support for audio, and fix HPD. - Add driver for ChromeOS privacy screen. - Handover display from firmware to vc4 more gracefully, and support nomodeset. - Add flexible and ycbcr pixel formats to stm/ltdc. - Convert exynos mipi dsi to atomic. - Add initial dual core group GPUs support to panfrost. - No longer add exclusive fence in amdgpu as shared fence. - Add CSC and full range supoprt to vc4. - Shutdown the display on system shutdown and unbind. - Add Multi-Inno Technology MI0700S4T-6 simple panel. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/456a23c6-7324-7543-0c45-751f30ef83f7@linux.intel.com
196 lines
5.6 KiB
C
196 lines
5.6 KiB
C
// SPDX-License-Identifier: GPL-2.0 OR MIT
|
|
/*
|
|
* Copyright 2016-2021 Advanced Micro Devices, Inc.
|
|
*
|
|
* 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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: Christian König, Felix Kuehling
|
|
*/
|
|
|
|
#include "amdgpu.h"
|
|
|
|
static inline struct amdgpu_preempt_mgr *
|
|
to_preempt_mgr(struct ttm_resource_manager *man)
|
|
{
|
|
return container_of(man, struct amdgpu_preempt_mgr, manager);
|
|
}
|
|
|
|
/**
|
|
* DOC: mem_info_preempt_used
|
|
*
|
|
* The amdgpu driver provides a sysfs API for reporting current total amount of
|
|
* used preemptible memory.
|
|
* The file mem_info_preempt_used is used for this, and returns the current
|
|
* used size of the preemptible block, in bytes
|
|
*/
|
|
static ssize_t mem_info_preempt_used_show(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct drm_device *ddev = dev_get_drvdata(dev);
|
|
struct amdgpu_device *adev = drm_to_adev(ddev);
|
|
struct ttm_resource_manager *man;
|
|
|
|
man = ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_PREEMPT);
|
|
return sysfs_emit(buf, "%llu\n", amdgpu_preempt_mgr_usage(man));
|
|
}
|
|
|
|
static DEVICE_ATTR_RO(mem_info_preempt_used);
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_new - allocate a new node
|
|
*
|
|
* @man: TTM memory type manager
|
|
* @tbo: TTM BO we need this range for
|
|
* @place: placement flags and restrictions
|
|
* @res: TTM memory object
|
|
*
|
|
* Dummy, just count the space used without allocating resources or any limit.
|
|
*/
|
|
static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
|
|
struct ttm_buffer_object *tbo,
|
|
const struct ttm_place *place,
|
|
struct ttm_resource **res)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
|
|
|
|
*res = kzalloc(sizeof(**res), GFP_KERNEL);
|
|
if (!*res)
|
|
return -ENOMEM;
|
|
|
|
ttm_resource_init(tbo, place, *res);
|
|
(*res)->start = AMDGPU_BO_INVALID_OFFSET;
|
|
|
|
atomic64_add((*res)->num_pages, &mgr->used);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_del - free ranges
|
|
*
|
|
* @man: TTM memory type manager
|
|
* @res: TTM memory object
|
|
*
|
|
* Free the allocated GTT again.
|
|
*/
|
|
static void amdgpu_preempt_mgr_del(struct ttm_resource_manager *man,
|
|
struct ttm_resource *res)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
|
|
|
|
atomic64_sub(res->num_pages, &mgr->used);
|
|
ttm_resource_fini(man, res);
|
|
kfree(res);
|
|
}
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_usage - return usage of PREEMPT domain
|
|
*
|
|
* @man: TTM memory type manager
|
|
*
|
|
* Return how many bytes are used in the GTT domain
|
|
*/
|
|
uint64_t amdgpu_preempt_mgr_usage(struct ttm_resource_manager *man)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
|
|
s64 result = atomic64_read(&mgr->used);
|
|
|
|
return (result > 0 ? result : 0) * PAGE_SIZE;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_debug - dump VRAM table
|
|
*
|
|
* @man: TTM memory type manager
|
|
* @printer: DRM printer to use
|
|
*
|
|
* Dump the table content using printk.
|
|
*/
|
|
static void amdgpu_preempt_mgr_debug(struct ttm_resource_manager *man,
|
|
struct drm_printer *printer)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
|
|
|
|
drm_printf(printer, "man size:%llu pages, preempt used:%lld pages\n",
|
|
man->size, (u64)atomic64_read(&mgr->used));
|
|
}
|
|
|
|
static const struct ttm_resource_manager_func amdgpu_preempt_mgr_func = {
|
|
.alloc = amdgpu_preempt_mgr_new,
|
|
.free = amdgpu_preempt_mgr_del,
|
|
.debug = amdgpu_preempt_mgr_debug
|
|
};
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_init - init PREEMPT manager and DRM MM
|
|
*
|
|
* @adev: amdgpu_device pointer
|
|
*
|
|
* Allocate and initialize the GTT manager.
|
|
*/
|
|
int amdgpu_preempt_mgr_init(struct amdgpu_device *adev)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr;
|
|
struct ttm_resource_manager *man = &mgr->manager;
|
|
int ret;
|
|
|
|
man->use_tt = true;
|
|
man->func = &amdgpu_preempt_mgr_func;
|
|
|
|
ttm_resource_manager_init(man, &adev->mman.bdev, (1 << 30));
|
|
|
|
atomic64_set(&mgr->used, 0);
|
|
|
|
ret = device_create_file(adev->dev, &dev_attr_mem_info_preempt_used);
|
|
if (ret) {
|
|
DRM_ERROR("Failed to create device file mem_info_preempt_used\n");
|
|
return ret;
|
|
}
|
|
|
|
ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT,
|
|
&mgr->manager);
|
|
ttm_resource_manager_set_used(man, true);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* amdgpu_preempt_mgr_fini - free and destroy GTT manager
|
|
*
|
|
* @adev: amdgpu_device pointer
|
|
*
|
|
* Destroy and free the GTT manager, returns -EBUSY if ranges are still
|
|
* allocated inside it.
|
|
*/
|
|
void amdgpu_preempt_mgr_fini(struct amdgpu_device *adev)
|
|
{
|
|
struct amdgpu_preempt_mgr *mgr = &adev->mman.preempt_mgr;
|
|
struct ttm_resource_manager *man = &mgr->manager;
|
|
int ret;
|
|
|
|
ttm_resource_manager_set_used(man, false);
|
|
|
|
ret = ttm_resource_manager_evict_all(&adev->mman.bdev, man);
|
|
if (ret)
|
|
return;
|
|
|
|
device_remove_file(adev->dev, &dev_attr_mem_info_preempt_used);
|
|
|
|
ttm_resource_manager_cleanup(man);
|
|
ttm_set_driver_manager(&adev->mman.bdev, AMDGPU_PL_PREEMPT, NULL);
|
|
}
|