drivers/gpu/drm/openchrome/openchrome_crtc.c | 12 +++---------
drivers/gpu/drm/openchrome/openchrome_drv.h | 2 --
2 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 324bc02c423e75d7003f3dd075da757479ad25ad
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Oct 14 16:28:39 2019 -0700
drm/openchrome: Rename openchrome_drm_plane_format struct
The new name is openchrome_primary_formats.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c
b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index f04829ad8deb..21587bd62d72 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -2485,7 +2485,7 @@ drm_crtc_helper_funcs
openchrome_iga2_drm_crtc_helper_funcs = {
.mode_set_base_atomic = via_iga2_mode_set_base_atomic,
};
-static const uint32_t openchrome_drm_plane_format[] = {
+static const uint32_t openchrome_primary_formats[] = {
DRM_FORMAT_XRGB8888,
DRM_FORMAT_ARGB8888,
DRM_FORMAT_RGB888,
@@ -2518,8 +2518,8 @@ int via_crtc_init(struct drm_device *dev, uint32_t index)
ret = drm_universal_plane_init(dev, primary, possible_crtcs,
&drm_primary_helper_funcs,
- openchrome_drm_plane_format,
- ARRAY_SIZE(openchrome_drm_plane_format),
+ openchrome_primary_formats,
+ ARRAY_SIZE(openchrome_primary_formats),
NULL, DRM_PLANE_TYPE_PRIMARY, NULL);
if (ret) {
DRM_ERROR("Failed to initialize a primary "
commit a5127ff0242c4826e3d98cc199f5da3a7ba36582
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Oct 14 16:28:01 2019 -0700
drm/openchrome: Remove unnecessary calling of drm_plane_helper_add()
Primary plane currently does not use helper functions.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c
b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 02642c09e15b..f04829ad8deb 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -2493,10 +2493,6 @@ static const uint32_t openchrome_drm_plane_format[] = {
DRM_FORMAT_RGB332,
};
-static const struct drm_plane_helper_funcs
-openchrome_drm_plane_helper_funcs = {
-};
-
int via_crtc_init(struct drm_device *dev, uint32_t index)
{
struct openchrome_drm_private *dev_private =
@@ -2520,8 +2516,6 @@ int via_crtc_init(struct drm_device *dev, uint32_t index)
goto exit;
}
- drm_plane_helper_add(primary,
- &openchrome_drm_plane_helper_funcs);
ret = drm_universal_plane_init(dev, primary, possible_crtcs,
&drm_primary_helper_funcs,
openchrome_drm_plane_format,
commit 8ee71a2b0ff39f16be5f10029fb99fae22873c6b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon Oct 14 16:27:07 2019 -0700
drm/openchrome: Remove DRM_FILE_PAGE_OFFSET macro
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 a287c9629cad..923e020e4e5b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -64,8 +64,6 @@
#define VIA_MM_ALIGN_SIZE 16
-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
#define CLE266_REVISION_AX 0x0A
#define CLE266_REVISION_CX 0x0C
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
