Merge tag 'amd-drm-next-6.13-2024-10-25' of https://gitlab.freedesktop.org/agd5f...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_drv.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 46f75651394882c94a6b6d84b112aafe8e45d6b2..6ac7d335e28eb83c943f2c8de1b5bd4b0b16513e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -23,6 +23,7 @@
  */
 
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_client_setup.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fbdev_ttm.h>
 #include <drm/drm_gem.h>
@@ -2360,11 +2361,15 @@ retry_init:
         */
        if (adev->mode_info.mode_config_initialized &&
            !list_empty(&adev_to_drm(adev)->mode_config.connector_list)) {
+               const struct drm_format_info *format;
+
                /* select 8 bpp console on low vram cards */
                if (adev->gmc.real_vram_size <= (32*1024*1024))
-                       drm_fbdev_ttm_setup(adev_to_drm(adev), 8);
+                       format = drm_format_info(DRM_FORMAT_C8);
                else
-                       drm_fbdev_ttm_setup(adev_to_drm(adev), 32);
+                       format = NULL;
+
+               drm_client_setup(adev_to_drm(adev), format);
        }
 
        ret = amdgpu_debugfs_init(adev);
@@ -2852,6 +2857,7 @@ static const struct file_operations amdgpu_driver_kms_fops = {
 #ifdef CONFIG_PROC_FS
        .show_fdinfo = drm_show_fdinfo,
 #endif
+       .fop_flags = FOP_UNSIGNED_OFFSET,
 };
 
 int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
@@ -2901,6 +2907,7 @@ static const struct drm_driver amdgpu_kms_driver = {
        .num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
        .dumb_create = amdgpu_mode_dumb_create,
        .dumb_map_offset = amdgpu_mode_dumb_mmap,
+       DRM_FBDEV_TTM_DRIVER_OPS,
        .fops = &amdgpu_driver_kms_fops,
        .release = &amdgpu_driver_release_kms,
 #ifdef CONFIG_PROC_FS
@@ -2927,6 +2934,7 @@ const struct drm_driver amdgpu_partition_driver = {
        .num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
        .dumb_create = amdgpu_mode_dumb_create,
        .dumb_map_offset = amdgpu_mode_dumb_mmap,
+       DRM_FBDEV_TTM_DRIVER_OPS,
        .fops = &amdgpu_driver_kms_fops,
        .release = &amdgpu_driver_release_kms,