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

[Kevin Brace]

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

New commits:
commit dc610530eb8b82ea580f13182318004dc43efaf5
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Thu Jan 12 15:44:09 2023 -0600

    drm/via: Version bumped to 3.6.2
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 47435977c1a0..68b267023c39 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -49,10 +49,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		6
-#define DRIVER_PATCHLEVEL	1
+#define DRIVER_PATCHLEVEL	2
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE		"20221205"
+#define DRIVER_DATE		"20230112"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit bb6afb288e4820af92f22064b2a49433f0df78c5
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Thu Jan 12 14:42:38 2023 -0600

    drm/via: Stop including drm/drm_fb_helper.h from via_drv.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index fdb508a8e1c4..e3b61e61f28c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -31,6 +31,7 @@
 #include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fbdev_generic.h>
+#include <drm/drm_fb_helper.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_ioctl.h>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index b91c64183271..47435977c1a0 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -37,7 +37,6 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
-#include <drm/drm_fb_helper.h>
 #include <drm/drm_plane.h>
 
 #include <drm/ttm/ttm_bo_api.h>
commit d0ac9b6e67518e05217deea93681a4df1f55d044
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Thu Jan 12 13:00:00 2023 -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 <kevinbrace at 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 fa8e394e3380d50fabbd013732ea8169519daf7d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Thu Jan 12 12:57:34 2023 -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 <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 628c41c048e8..9a0c1fd9ff1c 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, PFN_UP(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..07837a41edd4 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, PFN_UP(ttm_bo->resource->size),
 					&bo->kmap);
 		if (ret) {
 			ttm_bo_put(ttm_bo);