mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
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
...
160 lines
4.5 KiB
C
160 lines
4.5 KiB
C
// SPDX-License-Identifier: GPL-2.0 OR MIT
|
|
/**************************************************************************
|
|
*
|
|
* Copyright 2007-2010 VMware, Inc., Palo Alto, CA., USA
|
|
*
|
|
* 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, sub license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
|
*/
|
|
|
|
#include "vmwgfx_drv.h"
|
|
#include <drm/ttm/ttm_module.h>
|
|
#include <drm/ttm/ttm_bo_driver.h>
|
|
#include <drm/ttm/ttm_placement.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/kernel.h>
|
|
|
|
struct vmwgfx_gmrid_man {
|
|
struct ttm_resource_manager manager;
|
|
spinlock_t lock;
|
|
struct ida gmr_ida;
|
|
uint32_t max_gmr_ids;
|
|
uint32_t max_gmr_pages;
|
|
uint32_t used_gmr_pages;
|
|
};
|
|
|
|
static struct vmwgfx_gmrid_man *to_gmrid_manager(struct ttm_resource_manager *man)
|
|
{
|
|
return container_of(man, struct vmwgfx_gmrid_man, manager);
|
|
}
|
|
|
|
static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man,
|
|
struct ttm_buffer_object *bo,
|
|
const struct ttm_place *place,
|
|
struct ttm_resource *mem)
|
|
{
|
|
struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
|
|
int id;
|
|
|
|
id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
|
|
if (id < 0)
|
|
return id;
|
|
|
|
spin_lock(&gman->lock);
|
|
|
|
if (gman->max_gmr_pages > 0) {
|
|
gman->used_gmr_pages += bo->num_pages;
|
|
if (unlikely(gman->used_gmr_pages > gman->max_gmr_pages))
|
|
goto nospace;
|
|
}
|
|
|
|
mem->mm_node = gman;
|
|
mem->start = id;
|
|
mem->num_pages = bo->num_pages;
|
|
|
|
spin_unlock(&gman->lock);
|
|
return 0;
|
|
|
|
nospace:
|
|
gman->used_gmr_pages -= bo->num_pages;
|
|
spin_unlock(&gman->lock);
|
|
ida_free(&gman->gmr_ida, id);
|
|
return -ENOSPC;
|
|
}
|
|
|
|
static void vmw_gmrid_man_put_node(struct ttm_resource_manager *man,
|
|
struct ttm_resource *mem)
|
|
{
|
|
struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
|
|
|
|
if (mem->mm_node) {
|
|
ida_free(&gman->gmr_ida, mem->start);
|
|
spin_lock(&gman->lock);
|
|
gman->used_gmr_pages -= mem->num_pages;
|
|
spin_unlock(&gman->lock);
|
|
mem->mm_node = NULL;
|
|
}
|
|
}
|
|
|
|
static const struct ttm_resource_manager_func vmw_gmrid_manager_func;
|
|
|
|
int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
|
|
{
|
|
struct ttm_resource_manager *man;
|
|
struct vmwgfx_gmrid_man *gman =
|
|
kzalloc(sizeof(*gman), GFP_KERNEL);
|
|
|
|
if (unlikely(!gman))
|
|
return -ENOMEM;
|
|
|
|
man = &gman->manager;
|
|
|
|
man->func = &vmw_gmrid_manager_func;
|
|
/* TODO: This is most likely not correct */
|
|
man->use_tt = true;
|
|
ttm_resource_manager_init(man, 0);
|
|
spin_lock_init(&gman->lock);
|
|
gman->used_gmr_pages = 0;
|
|
ida_init(&gman->gmr_ida);
|
|
|
|
switch (type) {
|
|
case VMW_PL_GMR:
|
|
gman->max_gmr_ids = dev_priv->max_gmr_ids;
|
|
gman->max_gmr_pages = dev_priv->max_gmr_pages;
|
|
break;
|
|
case VMW_PL_MOB:
|
|
gman->max_gmr_ids = VMWGFX_NUM_MOB;
|
|
gman->max_gmr_pages = dev_priv->max_mob_pages;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
ttm_set_driver_manager(&dev_priv->bdev, type, &gman->manager);
|
|
ttm_resource_manager_set_used(man, true);
|
|
return 0;
|
|
}
|
|
|
|
void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
|
|
{
|
|
struct ttm_resource_manager *man = ttm_manager_type(&dev_priv->bdev, type);
|
|
struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
|
|
|
|
ttm_resource_manager_set_used(man, false);
|
|
|
|
ttm_resource_manager_force_list_clean(&dev_priv->bdev, man);
|
|
|
|
ttm_resource_manager_cleanup(man);
|
|
|
|
ttm_set_driver_manager(&dev_priv->bdev, type, NULL);
|
|
ida_destroy(&gman->gmr_ida);
|
|
kfree(gman);
|
|
|
|
}
|
|
|
|
static const struct ttm_resource_manager_func vmw_gmrid_manager_func = {
|
|
.alloc = vmw_gmrid_man_get_node,
|
|
.free = vmw_gmrid_man_put_node,
|
|
};
|