Merge tag 'pci-v5.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index db731f573f98202192b774298cbab04f2d834469..e2c2eb45a7934fadaf812b3b7f65c9cdfa3bbbc4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -135,7 +135,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
                               AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS     |
                               AMDGPU_GEM_CREATE_VRAM_CLEARED;
 
-       info = drm_get_format_info(adev->ddev, mode_cmd);
+       info = drm_get_format_info(adev_to_drm(adev), mode_cmd);
        cpp = info->cpp[0];
 
        /* need to align pitch with crtc limits */
@@ -231,7 +231,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
                goto out;
        }
 
-       ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb,
+       ret = amdgpu_display_framebuffer_init(adev_to_drm(adev), &rfbdev->rfb,
                                              &mode_cmd, gobj);
        if (ret) {
                DRM_ERROR("failed to initialize framebuffer %d\n", ret);
@@ -254,7 +254,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
        drm_fb_helper_fill_info(info, &rfbdev->helper, sizes);
 
        /* setup aperture base/size for vesafb takeover */
-       info->apertures->ranges[0].base = adev->ddev->mode_config.fb_base;
+       info->apertures->ranges[0].base = adev_to_drm(adev)->mode_config.fb_base;
        info->apertures->ranges[0].size = adev->gmc.aper_size;
 
        /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
@@ -270,7 +270,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
        DRM_INFO("fb depth is %d\n", fb->format->depth);
        DRM_INFO("   pitch is %d\n", fb->pitches[0]);
 
-       vga_switcheroo_client_fb_set(adev->ddev->pdev, info);
+       vga_switcheroo_client_fb_set(adev_to_drm(adev)->pdev, info);
        return 0;
 
 out:
@@ -318,7 +318,7 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
                return 0;
 
        /* don't init fbdev if there are no connectors */
-       if (list_empty(&adev->ddev->mode_config.connector_list))
+       if (list_empty(&adev_to_drm(adev)->mode_config.connector_list))
                return 0;
 
        /* select 8 bpp console on low vram cards */
@@ -332,10 +332,10 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
        rfbdev->adev = adev;
        adev->mode_info.rfbdev = rfbdev;
 
-       drm_fb_helper_prepare(adev->ddev, &rfbdev->helper,
-                       &amdgpu_fb_helper_funcs);
+       drm_fb_helper_prepare(adev_to_drm(adev), &rfbdev->helper,
+                             &amdgpu_fb_helper_funcs);
 
-       ret = drm_fb_helper_init(adev->ddev, &rfbdev->helper);
+       ret = drm_fb_helper_init(adev_to_drm(adev), &rfbdev->helper);
        if (ret) {
                kfree(rfbdev);
                return ret;
@@ -343,7 +343,7 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
 
        /* disable all the possible outputs/crtcs before entering KMS mode */
        if (!amdgpu_device_has_dc_support(adev))
-               drm_helper_disable_unused_functions(adev->ddev);
+               drm_helper_disable_unused_functions(adev_to_drm(adev));
 
        drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
        return 0;
@@ -354,7 +354,7 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev)
        if (!adev->mode_info.rfbdev)
                return;
 
-       amdgpu_fbdev_destroy(adev->ddev, adev->mode_info.rfbdev);
+       amdgpu_fbdev_destroy(adev_to_drm(adev), adev->mode_info.rfbdev);
        kfree(adev->mode_info.rfbdev);
        adev->mode_info.rfbdev = NULL;
 }