diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2026-03-19 10:01:55 +0100 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2026-03-19 10:01:55 +0100 |
| commit | 9e63413827a8ea464249c0aa8046ac8fe7d9cc47 (patch) | |
| tree | 10d0555682dd3d33744fc5a0e45815c70255fb01 /include/uapi | |
| parent | 7937ea733f79b3f25e802a0c8360bf7423856f36 (diff) | |
| parent | d93f8ea0e5ad41d661496d205fac3e2fbd9358c0 (diff) | |
| download | lwn-9e63413827a8ea464249c0aa8046ac8fe7d9cc47.tar.gz lwn-9e63413827a8ea464249c0aa8046ac8fe7d9cc47.zip | |
Merge drm/drm-next into drm-xe-next
Bring in series "drm/{i915,xe}: sort out step enums between the drivers"
that was merged through i915.
Link: https://lore.kernel.org/all/cover.1772635152.git.jani.nikula@intel.com
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/amdxdna_accel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/drm/amdxdna_accel.h b/include/uapi/drm/amdxdna_accel.h index 9c44db2b3dcd..5bd13f4435f5 100644 --- a/include/uapi/drm/amdxdna_accel.h +++ b/include/uapi/drm/amdxdna_accel.h @@ -353,7 +353,8 @@ struct amdxdna_drm_query_clock_metadata { }; enum amdxdna_sensor_type { - AMDXDNA_SENSOR_TYPE_POWER + AMDXDNA_SENSOR_TYPE_POWER, + AMDXDNA_SENSOR_TYPE_COLUMN_UTILIZATION }; /** |