[openchrome-devel] drm-openchrome: Branch 'drm-next-6.2' - 3 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/via/via_cursor.c |    2 +-
 drivers/gpu/drm/via/via_drv.c    |    2 +-
 drivers/gpu/drm/via/via_init.c   |    2 --
 drivers/gpu/drm/via/via_object.c |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit ff418592d4d3a5f236b00cd1ea525eeca61a785c
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date:   Mon Dec 26 13:45:05 2022 -0600

    drm/fb-helper: Move generic fbdev emulation into separate source file
    
    Based on commit 8ab59da (drm/fb-helper: Move generic fbdev emulation
    into separate source file).
    
    Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 274df166b394..fdb508a8e1c4 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -30,7 +30,7 @@
 
 #include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
-#include <drm/drm_fb_helper.h>
+#include <drm/drm_fbdev_generic.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_ioctl.h>
commit 5baa67c9fdf5b325e7cc03e83bfc981ff0949e80
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date:   Mon Dec 26 13:45:04 2022 -0600

    drm/ttm: rework on ttm_resource to use size_t type
    
    Based on commit e3c92eb (drm/ttm: rework on ttm_resource to use
    size_t type).
    
    Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 628c41c048e8..e800aff1178b 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -276,7 +276,7 @@ static int via_cursor_prepare_fb(struct drm_plane *plane,
 
        ret = via_bo_pin(bo, TTM_PL_VRAM);
        ttm_bo_unreserve(ttm_bo);
-       ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->num_pages, &bo->kmap);
+       ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->size, &bo->kmap);
        if (ret) {
                goto exit;
        }
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 3d65ecb4ef1d..eff187af86e3 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -228,7 +228,7 @@ int via_bo_create(struct drm_device *dev,
                        goto exit;
                }
 
-               ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->num_pages,
+               ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->size,
                                        &bo->kmap);
                if (ret) {
                        ttm_bo_put(ttm_bo);
commit b7d0856da4c2db186cc1ddf28ea8747328ca2465
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date:   Mon Dec 26 13:45:03 2022 -0600

    drm: Remove drm_mode_config::fb_base
    
    Based on commit 7c99616 (drm: Remove drm_mode_config::fb_base).
    
    Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index f3cf17a3b1b8..701c02be4737 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1234,8 +1234,6 @@ void via_mode_config_init(struct via_drm_priv *dev_priv)
 
        dev->mode_config.funcs = &via_drm_mode_config_funcs;
 
-       dev->mode_config.fb_base = dev_priv->vram_start;
-
        dev->mode_config.preferred_depth = 24;
        dev->mode_config.prefer_shadow_fbdev = true;