drivers/gpu/drm/openchrome/openchrome_cursor.c | 5 +----
drivers/gpu/drm/openchrome/openchrome_drv.c | 16 +++-------------
drivers/gpu/drm/openchrome/openchrome_drv.h | 7 +++----
drivers/gpu/drm/openchrome/openchrome_init.c | 10 ++++++++++
4 files changed, 17 insertions(+), 21 deletions(-)
New commits:
commit de4a3a8c8e08592931768938d32548bfb03d17a2
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Sep 10 12:44:56 2020 -0700
drm/openchrome: Version bumped to 3.3.3
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 38e60a9b1ea4..b34c6916e7ba 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -61,10 +61,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 3
-#define DRIVER_PATCHLEVEL 2
+#define DRIVER_PATCHLEVEL 3
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20200908"
+#define DRIVER_DATE "20200910"
#define DRIVER_AUTHOR "OpenChrome Project"
commit b543a5b0a185462048264abf7de564c6277ecb8b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Sep 10 12:44:41 2020 -0700
drm/openchrome: No need to hide cursor when destroying the cursor plane
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_cursor.c
b/drivers/gpu/drm/openchrome/openchrome_cursor.c
index a381987a47f1..a54b7fa20526 100644
--- a/drivers/gpu/drm/openchrome/openchrome_cursor.c
+++ b/drivers/gpu/drm/openchrome/openchrome_cursor.c
@@ -338,10 +338,6 @@ static int openchrome_cursor_disable_plane(struct
drm_plane *plane,
static void openchrome_cursor_destroy(struct drm_plane *plane)
{
- if (plane->crtc) {
- openchrome_hide_cursor(plane->crtc);
- }
-
drm_plane_cleanup(plane);
kfree(plane);
}
commit 28a719720379424a93dec526ff3b1528fb1f32ac
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Sep 10 12:44:24 2020 -0700
drm/openchrome: Free drm_plane struct when destroying a cursor plane
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_cursor.c
b/drivers/gpu/drm/openchrome/openchrome_cursor.c
index ac9c81191f68..a381987a47f1 100644
--- a/drivers/gpu/drm/openchrome/openchrome_cursor.c
+++ b/drivers/gpu/drm/openchrome/openchrome_cursor.c
@@ -343,6 +343,7 @@ static void openchrome_cursor_destroy(struct drm_plane
*plane)
}
drm_plane_cleanup(plane);
+ kfree(plane);
}
const struct drm_plane_funcs openchrome_cursor_drm_plane_funcs = {
commit d4247917ddd510e5eeeffc63b373c480b03915c0
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Wed Sep 9 09:25:40 2020 -0700
drm/openchrome: Omit KMS check in other parts of the code
Commit f98964f missed the complete removal of KMS check from
the code. This commit finishes the task.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index e1988b0303ac..278a0481292d 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -137,8 +137,7 @@ static void openchrome_driver_unload(struct drm_device *dev)
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- if (drm_core_check_feature(dev, DRIVER_MODESET))
- via_modeset_fini(dev);
+ via_modeset_fini(dev);
openchrome_mm_fini(dev_private);
openchrome_device_fini(dev_private);
@@ -203,9 +202,7 @@ static void openchrome_driver_lastclose(struct drm_device
*dev)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- if (drm_core_check_feature(dev, DRIVER_MODESET) &&
- dev->mode_config.funcs->output_poll_changed)
- dev->mode_config.funcs->output_poll_changed(dev);
+ dev->mode_config.funcs->output_poll_changed(dev);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
commit 3294e05461188304d2564ae72b4914abf0f3ffd9
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Wed Sep 9 09:25:24 2020 -0700
drm/openchrome: Add openchrome_device_fini() for teardown
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 427c2383f92b..e1988b0303ac 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -141,13 +141,7 @@ static void openchrome_driver_unload(struct drm_device
*dev)
via_modeset_fini(dev);
openchrome_mm_fini(dev_private);
-
- /*
- * Unmap VRAM.
- */
- openchrome_vram_fini(dev_private);
-
- openchrome_mmio_fini(dev_private);
+ openchrome_device_fini(dev_private);
kfree(dev_private);
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 41670c1a8bda..38e60a9b1ea4 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -391,6 +391,7 @@ void openchrome_graphics_unlock(
struct openchrome_drm_private *dev_private);
void chip_revision_info(struct openchrome_drm_private *dev_private);
int openchrome_device_init(struct openchrome_drm_private *dev_private);
+void openchrome_device_fini(struct openchrome_drm_private *dev_private);
int openchrome_dev_pm_ops_suspend(struct device *dev);
int openchrome_dev_pm_ops_resume(struct device *dev);
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c
b/drivers/gpu/drm/openchrome/openchrome_init.c
index f7f9f49bbe65..e0432595eda1 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -1231,3 +1231,13 @@ exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
}
+
+void openchrome_device_fini(struct openchrome_drm_private *dev_private)
+{
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
+
+ openchrome_mmio_fini(dev_private);
+ openchrome_vram_fini(dev_private);
+
+ DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+}
commit f3ac75eae98a99026d8d065efcd99d2b104b8ebf
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Wed Sep 9 09:24:36 2020 -0700
drm/openchrome: Stop remembering graphics engine type
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index cdbf293c4bc5..427c2383f92b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -173,7 +173,6 @@ static int openchrome_driver_load(struct drm_device *dev,
}
dev->dev_private = (void *) dev_private;
- dev_private->engine_type = chipset;
dev_private->vram_mtrr = -ENXIO;
dev_private->dev = dev;
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 5c1f15b8aa33..41670c1a8bda 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -241,8 +241,6 @@ struct openchrome_drm_private {
struct via_state pm_cache;
- enum via_engine engine_type;
-
bool spread_spectrum;
/*
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
