On 6/8/26 21:47, Shahyan Soltani wrote: > Move struct amdgpu_video_codec_info, struct amdgpu_video_codecs, and helpers > into a new > amdgpu_video_codecs.h file. > > This is part of the ongoing effort to reduce the size of amdgpu.h into their > own respective > separate headers. > > Signed-off-by: Shahyan Soltani <[email protected]>
Reviewed-by: Christian König <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 21 +-------- > .../gpu/drm/amd/amdgpu/amdgpu_video_codecs.h | 47 +++++++++++++++++++ > 2 files changed, 48 insertions(+), 20 deletions(-) > create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_video_codecs.h > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 0f8743254fe6..8fb70731ea58 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -115,6 +115,7 @@ > #include "amdgpu_wb.h" > #include "amdgpu_ip.h" > #include "amdgpu_uid.h" > +#include "amdgpu_video_codecs.h" > #if defined(CONFIG_DRM_AMD_ISP) > #include "amdgpu_isp.h" > #endif > @@ -444,26 +445,6 @@ struct amdgpu_allowed_register_entry { > bool grbm_indexed; > }; > > -struct amdgpu_video_codec_info { > - u32 codec_type; > - u32 max_width; > - u32 max_height; > - u32 max_pixels_per_frame; > - u32 max_level; > -}; > - > -#define codec_info_build(type, width, height, level) \ > - .codec_type = type,\ > - .max_width = width,\ > - .max_height = height,\ > - .max_pixels_per_frame = height * width,\ > - .max_level = level, > - > -struct amdgpu_video_codecs { > - const u32 codec_count; > - const struct amdgpu_video_codec_info *codec_array; > -}; > - > /* > * ASIC specific functions. > */ > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_video_codecs.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_video_codecs.h > new file mode 100644 > index 000000000000..3b2a6cb8632d > --- /dev/null > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_video_codecs.h > @@ -0,0 +1,47 @@ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT > + * > + * Copyright 2026 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. > + */ > +#ifndef __AMDGPU_VIDEO_CODECS_H__ > +#define __AMDGPU_VIDEO_CODECS_H__ > + > +#include <linux/types.h> > + > +#define codec_info_build(type, width, height, level) \ > + .codec_type = type,\ > + .max_width = width,\ > + .max_height = height,\ > + .max_pixels_per_frame = height * width,\ > + .max_level = level, > + > +struct amdgpu_video_codec_info { > + u32 codec_type; > + u32 max_width; > + u32 max_height; > + u32 max_pixels_per_frame; > + u32 max_level; > +}; > + > +struct amdgpu_video_codecs { > + const u32 codec_count; > + const struct amdgpu_video_codec_info *codec_array; > +}; > +#endif
