mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 05:31:37 -04:00
Pull drm updates from Dave Airlie:
"Highlights:
- new DRM RAS infrastructure using netlink
- amdgpu: enable DC on CIK APUs, and more IP enablement, and more
user queue work
- xe: purgeable BO support, and new hw enablement
- dma-buf : add revocable operations
Full summary:
mm:
- two-pass MMU interval notifiers
- add gpu active/reclaim per-node stat counters
math:
- provide __KERNEL_DIV_ROUND_CLOSEST() in UAPI
- implement DIV_ROUND_CLOSEST() with __KERNEL_DIV_ROUND_CLOSEST()
rust:
- shared tag with driver-core: register macro and io infra
- core: rework DMA coherent API
- core: add interop::list to interop with C linked lists
- core: add more num::Bounded operations
- core: enable generic_arg_infer and add EMSGSIZE
- workqueue: add ARef<T> support for work and delayed work
- add GPU buddy allocator abstraction
- add DRM shmem GEM helper abstraction
- allow drm:::Device to dispatch work and delayed work items
to driver private data
- add dma_resv_lock helper and raw accessors
core:
- introduce DRM RAS infrastructure over netlink
- add connector panel_type property
- fourcc: add ARM interleaved 64k modifier
- colorop: add destroy helper
- suballoc: split into alloc and init helpers
- mode: provide DRM_ARGB_GET*() macros for reading color components
edid:
- provide drm_output_color_Format
dma-buf:
- provide revoke mechanism for shared buffers
- rename move_notify to invalidate_mappings
- always enable move_notify
- protect dma_fence_ops with RCU and improve locking
- clean pages with helpers
atomic:
- allocate drm_private_state via callback
- helper: use system_percpu_wq
buddy:
- make buddy allocator available to gpu level
- add kernel-doc for buddy allocator
- improve aligned allocation
ttm:
- fix fence signalling
- improve tests and docs
- improve handling of gfp_retry_mayfail
- use per-node stat counters to track memory allocations
- port pool to use list_lru
- drop NUMA specific pools
- make pool shrinker numa aware
- track allocated pages per numa node
coreboot:
- cleanup coreboot framebuffer support
sched:
- fix race condition in drm_sched_fini
pagemap:
- enable THP support
- pass pagemap_addr by reference
gem-shmem:
- Track page accessed/dirty status across mmap/vmap
gpusvm:
- reenable device to device migration
- fix unbalanced unclock
bridge:
- anx7625: Support USB-C plus DT bindings
- connector: Fix EDID detection
- dw-hdmi-qp: Support Vendor-Specfic and SDP Infoframes; improve
others
- fsl-ldb: Fix visual artifacts plus related DT property
'enable-termination-resistor'
- imx8qxp-pixel-link: Improve bridge reference handling
- lt9611: Support Port-B-only input plus DT bindings
- tda998x: Support DRM_BRIDGE_ATTACH_NO_CONNECTOR; Clean up
- Support TH1520 HDMI plus DT bindings
- waveshare-dsi: Fix register and attach; Support 1..4 DSI lanes plus
DT bindings
- anx7625: Fix USB Type-C handling
- cdns-mhdp8546-core: Handle HDCP state in bridge atomic_check
- Support Lontium LT8713SX DP MST bridge plus DT bindings
- analogix_dp: Use DP helpers for link training
panel:
- panel-jdi-lt070me05000: Use mipi-dsi multi functions
- panel-edp: Support Add AUO B116XAT04.1 (HW: 1A); Support CMN
N116BCL-EAK (C2); Support FriendlyELEC plus DT changes
- panel-edp: Fix timings for BOE NV140WUM-N64
- ilitek-ili9882t: Allow GPIO calls to sleep
- jadard: Support TAIGUAN XTI05101-01A
- lxd: Support LXD M9189A plus DT bindings
- mantix: Fix pixel clock; Clean up
- motorola: Support Motorola Atrix 4G and Droid X2 plus DT bindings
- novatek: Support Novatek/Tianma NT37700F plus DT bindings
- simple: Support EDT ET057023UDBA plus DT bindings; Support Powertip
PH800480T032-ZHC19 plus DT bindings; Support Waveshare 13.3"
- novatek-nt36672a: Use mipi_dsi_*_multi() functions
- panel-edp: Support BOE NV153WUM-N42, CMN N153JCA-ELK, CSW
MNF307QS3-2
- support Himax HX83121A plus DT bindings
- support JuTouch JT070TM041 plus DT bindings
- support Samsung S6E8FC0 plus DT bindings
- himax-hx83102c: support Samsung S6E8FC0 plus DT bindings; support
backlight
- ili9806e: support Rocktech RK050HR345-CT106A plus DT bindings
- simple: support Tianma TM050RDH03 plus DT bindings
amdgpu:
- enable DC by default on CIK APUs
- userq fence ioctl param size fixes
- set panel_type to OLED for eDP
- refactor DC i2c code
- FAMS2 update
- rework ttm handling to allow multiple engines
- DC DCE 6.x cleanup
- DC support for NUTMEG/TRAVIS DP bridge
- DCN 4.2 support
- GC12 idle power fix for compute
- use struct drm_edid in non-DC code
- enable NV12/P010 support on primary planes
- support newer IP discovery tables
- VCN/JPEG 5.0.2 support
- GC/MES 12.1 updates
- USERQ fixes
- add DC idle state manager
- eDP DSC seamless boot
amdkfd:
- GC 12.1 updates
- non 4K page fixes
xe:
- basic Xe3p_LPG and NVL-P enabling patches
- allow VM_BIND decompress support
- add purgeable buffer object support
- add xe_vm_get_property_ioctl
- restrict multi-lrc to VCS/VECS engines
- allow disabling VM overcommit in fault mode
- dGPU memory optimizations
- Workaround cleanups and simplification
- Allow VFs VRAM quote changes using sysfs
- convert GT stats to per-cpu counters
- pagefault refactors
- enable multi-queue on xe3p_xpc
- disable DCC on PTL
- make MMIO communication more robust
- disable D3Cold for BMG on specific platforms
- vfio: improve FLR sync for Xe VFIO
i915/display:
- C10/C20/LT PHY PLL divider verification
- use trans push mechanism to generate PSR frame change on LNL+
- refactor DP DSC slice config
- VGA decode refactoring
- refactor DPT, gen2-4 overlay, masked field register macro helpers
- refactor stolen memory allocation decisions
- prepare for UHBR DP tunnels
- refactor LT PHY PLL to use DPLL framework
- implement register polling/waiting in display code
- add shared stepping header between i915 and display
i915:
- fix potential overflow of shmem scatterlist length
nouveau:
- provide Z cull info to userspace
- initial GA100 support
- shutdown on PCI device shutdown
nova-core:
- harden GSP command queue
- add support for large RPCs
- simplify GSP sequencer and message handling
- refactor falcon firmware handling
- convert to new register macro
- conver to new DMA coherent API
- use checked arithmetic
- add debugfs support for gsp-rm log buffers
- fix aux device registration for multi-GPU
msm:
- CI:
- Uprev mesa
- Restore CI jobs for Qualcomm APQ8016 and APQ8096 devices
- Core:
- Switched to of_get_available_child_by_name()
- DPU:
- Fixes for DSC panels
- Fixed brownout because of the frequency / OPP mismatch
- Quad pipe preparation (not enabled yet)
- Switched to virtual planes by default
- Dropped VBIF_NRT support
- Added support for Eliza platform
- Reworked alpha handling
- Switched to correct CWB definitions on Eliza
- Dropped dummy INTF_0 on MSM8953
- Corrected INTFs related to DP-MST
- DP:
- Removed debug prints looking into PHY internals
- DSI:
- Fixes for DSC panels
- RGB101010 support
- Support for SC8280XP
- Moved PHY bindings from display/ to phy/
- GPU:
- Preemption support for x2-85 and a840
- IFPC support for a840
- SKU detection support for x2-85 and a840
- Expose AQE support (VK ray-pipeline)
- Avoid locking in VM_BIND fence signaling path
- Fix to avoid reclaim in GPU snapshot path
- Disallow foreign mapping of _NO_SHARE BOs
- HDMI:
- Fixed infoframes programming
- MDP5:
- Dropped support for MSM8974v1
- Dropped now unused code for MSM8974 v1 and SDM660 / MSM8998
panthor:
- add tracepoints for power and IRQs
- fix fence handling
- extend timestamp query with flags
- support various sources for timestamp queries
tyr:
- fix names and model/versions
rockchip:
- vop2: use drm logging function
- rk3576 displayport support
- support CRTC background color
atmel-hlcdc:
- support sana5d65 LCD controller
tilcdc:
- use DT bindings schema
- use managed DRM interfaces
- support DRM_BRIDGE_ATTACH_NO_CONNECTOR
verisilicon:
- support DC8200 + DT bindings
virtgpu:
- support PRIME import with 3D enabled
komeda:
- fix integer overflow in AFBC checks
mcde:
- improve bridge handling
gma500:
- use drm client buffer for fbdev framebuffer
amdxdna:
- add sensors ioctls
- provide NPU power estimate
- support column utilization sensor
- allow forcing DMA through IOMMU IOVA
- support per-BO mem usage queries
- refactor GEM implementation
ivpu:
- update boot API to v3.29.4
- limit per-user number of doorbells/contexts
- perform engine reset on TDR error
loongson:
- replace custom code with drm_gem_ttm_dumb_map_offset()
imx:
- support planes behind the primary plane
- fix bus-format selection
vkms:
- support CRTC background color
v3d:
- improve handling of struct v3d_stats
komeda:
- support Arm China Linlon D6 plus DT bindings
imagination:
- improve power-off sequence
- support context-reset notification from firmware
mediatek:
- mtk_dsi: enable hs clock during pre-enable
- Remove all conflicting aperture devices during probe
- Add support for mt8167 display blocks"
* tag 'drm-next-2026-04-15' of https://gitlab.freedesktop.org/drm/kernel: (1735 commits)
drm/ttm/tests: Remove checks from ttm_pool_free_no_dma_alloc
drm/ttm/tests: fix lru_count ASSERT
drm/vram: remove DRM_VRAM_MM_FILE_OPERATIONS from docs
drm/fb-helper: Fix a locking bug in an error path
dma-fence: correct kernel-doc function parameter @flags
ttm/pool: track allocated_pages per numa node.
ttm/pool: make pool shrinker NUMA aware (v2)
ttm/pool: drop numa specific pools
ttm/pool: port to list_lru. (v2)
drm/ttm: use gpu mm stats to track gpu memory allocations. (v4)
mm: add gpu active/reclaim per-node stat counters (v2)
gpu: nova-core: fix missing colon in SEC2 boot debug message
gpu: nova-core: vbios: use from_le_bytes() for PCI ROM header parsing
gpu: nova-core: bitfield: fix broken Default implementation
gpu: nova-core: falcon: pad firmware DMA object size to required block alignment
gpu: nova-core: gsp: fix undefined behavior in command queue code
drm/shmem_helper: Make sure PMD entries get the writeable upgrade
accel/ivpu: Trigger recovery on TDR with OS scheduling
drm/msm: Use of_get_available_child_by_name()
dt-bindings: display/msm: move DSI PHY bindings to phy/ subdir
...
199 lines
5.2 KiB
Rust
199 lines
5.2 KiB
Rust
// SPDX-License-Identifier: GPL-2.0 or MIT
|
|
|
|
use kernel::{
|
|
clk::{
|
|
Clk,
|
|
OptionalClk, //
|
|
},
|
|
device::{
|
|
Bound,
|
|
Core,
|
|
Device, //
|
|
},
|
|
devres::Devres,
|
|
drm,
|
|
drm::ioctl,
|
|
io::poll,
|
|
new_mutex,
|
|
of,
|
|
platform,
|
|
prelude::*,
|
|
regulator,
|
|
regulator::Regulator,
|
|
sizes::SZ_2M,
|
|
sync::{
|
|
aref::ARef,
|
|
Arc,
|
|
Mutex, //
|
|
},
|
|
time, //
|
|
};
|
|
|
|
use crate::{
|
|
file::TyrDrmFileData,
|
|
gem::TyrObject,
|
|
gpu,
|
|
gpu::GpuInfo,
|
|
regs, //
|
|
};
|
|
|
|
pub(crate) type IoMem = kernel::io::mem::IoMem<SZ_2M>;
|
|
|
|
pub(crate) struct TyrDrmDriver;
|
|
|
|
/// Convenience type alias for the DRM device type for this driver.
|
|
pub(crate) type TyrDrmDevice = drm::Device<TyrDrmDriver>;
|
|
|
|
#[pin_data(PinnedDrop)]
|
|
pub(crate) struct TyrPlatformDriverData {
|
|
_device: ARef<TyrDrmDevice>,
|
|
}
|
|
|
|
#[pin_data(PinnedDrop)]
|
|
pub(crate) struct TyrDrmDeviceData {
|
|
pub(crate) pdev: ARef<platform::Device>,
|
|
|
|
#[pin]
|
|
clks: Mutex<Clocks>,
|
|
|
|
#[pin]
|
|
regulators: Mutex<Regulators>,
|
|
|
|
/// Some information on the GPU.
|
|
///
|
|
/// This is mainly queried by userspace, i.e.: Mesa.
|
|
pub(crate) gpu_info: GpuInfo,
|
|
}
|
|
|
|
fn issue_soft_reset(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result {
|
|
regs::GPU_CMD.write(dev, iomem, regs::GPU_CMD_SOFT_RESET)?;
|
|
|
|
poll::read_poll_timeout(
|
|
|| regs::GPU_IRQ_RAWSTAT.read(dev, iomem),
|
|
|status| *status & regs::GPU_IRQ_RAWSTAT_RESET_COMPLETED != 0,
|
|
time::Delta::from_millis(1),
|
|
time::Delta::from_millis(100),
|
|
)
|
|
.inspect_err(|_| dev_err!(dev, "GPU reset failed."))?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
kernel::of_device_table!(
|
|
OF_TABLE,
|
|
MODULE_OF_TABLE,
|
|
<TyrPlatformDriverData as platform::Driver>::IdInfo,
|
|
[
|
|
(of::DeviceId::new(c"rockchip,rk3588-mali"), ()),
|
|
(of::DeviceId::new(c"arm,mali-valhall-csf"), ())
|
|
]
|
|
);
|
|
|
|
impl platform::Driver for TyrPlatformDriverData {
|
|
type IdInfo = ();
|
|
const OF_ID_TABLE: Option<of::IdTable<Self::IdInfo>> = Some(&OF_TABLE);
|
|
|
|
fn probe(
|
|
pdev: &platform::Device<Core>,
|
|
_info: Option<&Self::IdInfo>,
|
|
) -> impl PinInit<Self, Error> {
|
|
let core_clk = Clk::get(pdev.as_ref(), Some(c"core"))?;
|
|
let stacks_clk = OptionalClk::get(pdev.as_ref(), Some(c"stacks"))?;
|
|
let coregroup_clk = OptionalClk::get(pdev.as_ref(), Some(c"coregroup"))?;
|
|
|
|
core_clk.prepare_enable()?;
|
|
stacks_clk.prepare_enable()?;
|
|
coregroup_clk.prepare_enable()?;
|
|
|
|
let mali_regulator = Regulator::<regulator::Enabled>::get(pdev.as_ref(), c"mali")?;
|
|
let sram_regulator = Regulator::<regulator::Enabled>::get(pdev.as_ref(), c"sram")?;
|
|
|
|
let request = pdev.io_request_by_index(0).ok_or(ENODEV)?;
|
|
let iomem = Arc::pin_init(request.iomap_sized::<SZ_2M>(), GFP_KERNEL)?;
|
|
|
|
issue_soft_reset(pdev.as_ref(), &iomem)?;
|
|
gpu::l2_power_on(pdev.as_ref(), &iomem)?;
|
|
|
|
let gpu_info = GpuInfo::new(pdev.as_ref(), &iomem)?;
|
|
gpu_info.log(pdev);
|
|
|
|
let platform: ARef<platform::Device> = pdev.into();
|
|
|
|
let data = try_pin_init!(TyrDrmDeviceData {
|
|
pdev: platform.clone(),
|
|
clks <- new_mutex!(Clocks {
|
|
core: core_clk,
|
|
stacks: stacks_clk,
|
|
coregroup: coregroup_clk,
|
|
}),
|
|
regulators <- new_mutex!(Regulators {
|
|
_mali: mali_regulator,
|
|
_sram: sram_regulator,
|
|
}),
|
|
gpu_info,
|
|
});
|
|
|
|
let ddev: ARef<TyrDrmDevice> = drm::Device::new(pdev.as_ref(), data)?;
|
|
drm::driver::Registration::new_foreign_owned(&ddev, pdev.as_ref(), 0)?;
|
|
|
|
let driver = TyrPlatformDriverData { _device: ddev };
|
|
|
|
// We need this to be dev_info!() because dev_dbg!() does not work at
|
|
// all in Rust for now, and we need to see whether probe succeeded.
|
|
dev_info!(pdev, "Tyr initialized correctly.\n");
|
|
Ok(driver)
|
|
}
|
|
}
|
|
|
|
#[pinned_drop]
|
|
impl PinnedDrop for TyrPlatformDriverData {
|
|
fn drop(self: Pin<&mut Self>) {}
|
|
}
|
|
|
|
#[pinned_drop]
|
|
impl PinnedDrop for TyrDrmDeviceData {
|
|
fn drop(self: Pin<&mut Self>) {
|
|
// TODO: the type-state pattern for Clks will fix this.
|
|
let clks = self.clks.lock();
|
|
clks.core.disable_unprepare();
|
|
clks.stacks.disable_unprepare();
|
|
clks.coregroup.disable_unprepare();
|
|
}
|
|
}
|
|
|
|
// We need to retain the name "panthor" to achieve drop-in compatibility with
|
|
// the C driver in the userspace stack.
|
|
const INFO: drm::DriverInfo = drm::DriverInfo {
|
|
major: 1,
|
|
minor: 5,
|
|
patchlevel: 0,
|
|
name: c"panthor",
|
|
desc: c"ARM Mali Tyr DRM driver",
|
|
};
|
|
|
|
#[vtable]
|
|
impl drm::Driver for TyrDrmDriver {
|
|
type Data = TyrDrmDeviceData;
|
|
type File = TyrDrmFileData;
|
|
type Object = drm::gem::Object<TyrObject>;
|
|
|
|
const INFO: drm::DriverInfo = INFO;
|
|
|
|
kernel::declare_drm_ioctls! {
|
|
(PANTHOR_DEV_QUERY, drm_panthor_dev_query, ioctl::RENDER_ALLOW, TyrDrmFileData::dev_query),
|
|
}
|
|
}
|
|
|
|
#[pin_data]
|
|
struct Clocks {
|
|
core: Clk,
|
|
stacks: OptionalClk,
|
|
coregroup: OptionalClk,
|
|
}
|
|
|
|
#[pin_data]
|
|
struct Regulators {
|
|
_mali: Regulator<regulator::Enabled>,
|
|
_sram: Regulator<regulator::Enabled>,
|
|
}
|