[openchrome-devel] drm-openchrome: Branch 'drm-next-5.18' - 3 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Tue Jan 25 22:38:42 UTC 2022
drivers/gpu/drm/openchrome/openchrome_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ed3211a6fc8111854149dcdef4b4492963c50668
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 25 16:35:17 2022 -0600
drm/openchrome: Version bumped to 3.4.16
Previous patch level did not completely eliminate openchrome_fb.c.
This one does.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 10fd7958e3f3..15624d9eb84b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -60,10 +60,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 4
-#define DRIVER_PATCHLEVEL 15
+#define DRIVER_PATCHLEVEL 16
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20220121"
+#define DRIVER_DATE "20220125"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 3b0c41761708806138b39ad4673683c939e644a4
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 25 16:32:26 2022 -0600
drm/openchrome: Delete openchrome_fb.c again
Move the remaining openchrome_mode_config_init() into openchrome_init.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/Makefile b/drivers/gpu/drm/openchrome/Makefile
index 57cafce15d2d..7624fedde5d4 100644
--- a/drivers/gpu/drm/openchrome/Makefile
+++ b/drivers/gpu/drm/openchrome/Makefile
@@ -11,7 +11,6 @@ openchrome-y := openchrome_analog.o \
openchrome_display.o \
openchrome_drv.o \
openchrome_encoder.o \
- openchrome_fb.o \
openchrome_fp.o \
openchrome_hdmi.o \
openchrome_i2c.o \
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 2d485215474c..10fd7958e3f3 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -378,6 +378,8 @@ void openchrome_graphics_unlock(
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);
+void openchrome_mode_config_init(
+ struct openchrome_drm_private *dev_private);
int openchrome_drm_init(struct drm_device *dev);
void openchrome_drm_fini(struct drm_device *dev);
@@ -439,10 +441,6 @@ void via_i2c_exit(void);
u32 via_get_clk_value(struct drm_device *dev, u32 clk);
void via_set_vclock(struct drm_crtc *crtc, u32 clk);
-/* framebuffers */
-void openchrome_mode_config_init(
- struct openchrome_drm_private *dev_private);
-
/* crtc */
void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
struct drm_display_mode *mode);
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c
deleted file mode 100644
index 7277a69601a7..000000000000
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2012 James Simmons <jsimmons at infradead.org>. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_drv.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_mode_config.h>
-
-#include "openchrome_drv.h"
-
-
-static const struct drm_mode_config_funcs openchrome_drm_mode_config_funcs = {
- .fb_create = drm_gem_fb_create,
- .atomic_check = drm_atomic_helper_check,
- .atomic_commit = drm_atomic_helper_commit,
-};
-
-void openchrome_mode_config_init(
- struct openchrome_drm_private *dev_private)
-{
- struct drm_device *dev = dev_private->dev;
-
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
- drm_mode_config_init(dev);
-
- dev->mode_config.min_width = 0;
- dev->mode_config.min_height = 0;
- dev->mode_config.max_width = 2044;
- dev->mode_config.max_height = 4096;
-
- dev->mode_config.funcs = &openchrome_drm_mode_config_funcs;
-
- dev->mode_config.fb_base = dev_private->vram_start;
-
- dev->mode_config.preferred_depth = 24;
- dev->mode_config.prefer_shadow_fbdev = true;
-
- dev->mode_config.cursor_width =
- dev->mode_config.cursor_height = OPENCHROME_CURSOR_SIZE;
-
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
-}
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index e6f4948e9742..80d8d7a61d5f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -28,6 +28,11 @@
#include <linux/module.h>
#include <linux/console.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_mode_config.h>
+
#include "openchrome_drv.h"
@@ -1262,6 +1267,40 @@ void openchrome_device_fini(struct openchrome_drm_private *dev_private)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
+static const struct
+drm_mode_config_funcs openchrome_drm_mode_config_funcs = {
+ .fb_create = drm_gem_fb_create,
+ .atomic_check = drm_atomic_helper_check,
+ .atomic_commit = drm_atomic_helper_commit,
+};
+
+void openchrome_mode_config_init(
+ struct openchrome_drm_private *dev_private)
+{
+ struct drm_device *dev = dev_private->dev;
+
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
+
+ drm_mode_config_init(dev);
+
+ dev->mode_config.min_width = 0;
+ dev->mode_config.min_height = 0;
+ dev->mode_config.max_width = 2044;
+ dev->mode_config.max_height = 4096;
+
+ dev->mode_config.funcs = &openchrome_drm_mode_config_funcs;
+
+ dev->mode_config.fb_base = dev_private->vram_start;
+
+ dev->mode_config.preferred_depth = 24;
+ dev->mode_config.prefer_shadow_fbdev = true;
+
+ dev->mode_config.cursor_width =
+ dev->mode_config.cursor_height = OPENCHROME_CURSOR_SIZE;
+
+ DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+}
+
int openchrome_drm_init(struct drm_device *dev)
{
struct openchrome_drm_private *dev_private;
commit 49d757c4f075d56d6b0e62350fefb7353ad03dbf
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 25 16:32:24 2022 -0600
Revert "drm/openchrome: Delete openchrome_fb.c"
This reverts commit 55d61db313bc768bc696ceec2f3397aebce35741.
diff --git a/drivers/gpu/drm/openchrome/Makefile b/drivers/gpu/drm/openchrome/Makefile
index 7624fedde5d4..57cafce15d2d 100644
--- a/drivers/gpu/drm/openchrome/Makefile
+++ b/drivers/gpu/drm/openchrome/Makefile
@@ -11,6 +11,7 @@ openchrome-y := openchrome_analog.o \
openchrome_display.o \
openchrome_drv.o \
openchrome_encoder.o \
+ openchrome_fb.o \
openchrome_fp.o \
openchrome_hdmi.o \
openchrome_i2c.o \
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 10fd7958e3f3..2d485215474c 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -378,8 +378,6 @@ void openchrome_graphics_unlock(
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);
-void openchrome_mode_config_init(
- struct openchrome_drm_private *dev_private);
int openchrome_drm_init(struct drm_device *dev);
void openchrome_drm_fini(struct drm_device *dev);
@@ -441,6 +439,10 @@ void via_i2c_exit(void);
u32 via_get_clk_value(struct drm_device *dev, u32 clk);
void via_set_vclock(struct drm_crtc *crtc, u32 clk);
+/* framebuffers */
+void openchrome_mode_config_init(
+ struct openchrome_drm_private *dev_private);
+
/* crtc */
void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
struct drm_display_mode *mode);
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c
index e69de29bb2d1..7277a69601a7 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012 James Simmons <jsimmons at infradead.org>. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_mode_config.h>
+
+#include "openchrome_drv.h"
+
+
+static const struct drm_mode_config_funcs openchrome_drm_mode_config_funcs = {
+ .fb_create = drm_gem_fb_create,
+ .atomic_check = drm_atomic_helper_check,
+ .atomic_commit = drm_atomic_helper_commit,
+};
+
+void openchrome_mode_config_init(
+ struct openchrome_drm_private *dev_private)
+{
+ struct drm_device *dev = dev_private->dev;
+
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
+
+ drm_mode_config_init(dev);
+
+ dev->mode_config.min_width = 0;
+ dev->mode_config.min_height = 0;
+ dev->mode_config.max_width = 2044;
+ dev->mode_config.max_height = 4096;
+
+ dev->mode_config.funcs = &openchrome_drm_mode_config_funcs;
+
+ dev->mode_config.fb_base = dev_private->vram_start;
+
+ dev->mode_config.preferred_depth = 24;
+ dev->mode_config.prefer_shadow_fbdev = true;
+
+ dev->mode_config.cursor_width =
+ dev->mode_config.cursor_height = OPENCHROME_CURSOR_SIZE;
+
+ DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+}
diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c
index 80d8d7a61d5f..e6f4948e9742 100644
--- a/drivers/gpu/drm/openchrome/openchrome_init.c
+++ b/drivers/gpu/drm/openchrome/openchrome_init.c
@@ -28,11 +28,6 @@
#include <linux/module.h>
#include <linux/console.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_drv.h>
-#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_mode_config.h>
-
#include "openchrome_drv.h"
@@ -1267,40 +1262,6 @@ void openchrome_device_fini(struct openchrome_drm_private *dev_private)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static const struct
-drm_mode_config_funcs openchrome_drm_mode_config_funcs = {
- .fb_create = drm_gem_fb_create,
- .atomic_check = drm_atomic_helper_check,
- .atomic_commit = drm_atomic_helper_commit,
-};
-
-void openchrome_mode_config_init(
- struct openchrome_drm_private *dev_private)
-{
- struct drm_device *dev = dev_private->dev;
-
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
- drm_mode_config_init(dev);
-
- dev->mode_config.min_width = 0;
- dev->mode_config.min_height = 0;
- dev->mode_config.max_width = 2044;
- dev->mode_config.max_height = 4096;
-
- dev->mode_config.funcs = &openchrome_drm_mode_config_funcs;
-
- dev->mode_config.fb_base = dev_private->vram_start;
-
- dev->mode_config.preferred_depth = 24;
- dev->mode_config.prefer_shadow_fbdev = true;
-
- dev->mode_config.cursor_width =
- dev->mode_config.cursor_height = OPENCHROME_CURSOR_SIZE;
-
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
-}
-
int openchrome_drm_init(struct drm_device *dev)
{
struct openchrome_drm_private *dev_private;
More information about the openchrome-devel
mailing list