drivers/gpu/drm/openchrome/openchrome_analog.c | 1 -
drivers/gpu/drm/openchrome/openchrome_crtc.c | 3 +++
drivers/gpu/drm/openchrome/openchrome_cursor.c | 1 +
drivers/gpu/drm/openchrome/openchrome_display.c | 14 --------------
drivers/gpu/drm/openchrome/openchrome_drv.c | 3 +++
drivers/gpu/drm/openchrome/openchrome_drv.h | 8 ++------
drivers/gpu/drm/openchrome/openchrome_fb.c | 4 +++-
drivers/gpu/drm/openchrome/openchrome_ioctl.c | 3 +++
drivers/gpu/drm/openchrome/openchrome_object.c | 1 +
drivers/gpu/drm/openchrome/openchrome_sii164.c | 1 -
drivers/gpu/drm/openchrome/openchrome_tmds.c | 1 -
drivers/gpu/drm/openchrome/openchrome_vt1632.c | 1 -
12 files changed, 16 insertions(+), 25 deletions(-)
New commits:
commit 9f86246847f0ec8caac3303c3a788d72e16984e6
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jan 4 16:34:07 2022 -0600
drm/openchrome: Version bumped to 3.4.11
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 c7b05ea70c0f..3427e05cc59a 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 10
+#define DRIVER_PATCHLEVEL 11
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20211227"
+#define DRIVER_DATE "20220104"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 96bbfd03a455ae75079155de7dbe24d809708598
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jan 4 15:49:25 2022 -0600
drm/openchrome: Add drm/ when including drm_gem_framebuffer_helper.h
Commit edd6b31 (drm/openchrome: Use GEM framebuffer helpers for
drm_framebuffer_funcs) missed "drm/" in front of the header file.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c
b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 83c4b9332d8e..b6ebd2440ea3 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -29,7 +29,7 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem.h>
-#include <drm_gem_framebuffer_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/ttm/ttm_bo_api.h>
commit 440eb47343f0f4b7bffda6f3b57c92de8f4bb3de
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jan 4 15:48:57 2022 -0600
drm/openchrome: Include drm_gem.h and ttm_bo_api.h where appropriate
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 b65e72d0414c..8047be5b92d2 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -39,12 +39,15 @@
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fourcc.h>
+#include <drm/drm_gem.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_mode.h>
#include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_plane.h>
#include <drm/drm_plane_helper.h>
+#include <drm/ttm/ttm_bo_api.h>
+
#include "openchrome_drv.h"
#include "openchrome_disp_reg.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_cursor.c
b/drivers/gpu/drm/openchrome/openchrome_cursor.c
index dc662fa02fb1..058f935a517a 100644
--- a/drivers/gpu/drm/openchrome/openchrome_cursor.c
+++ b/drivers/gpu/drm/openchrome/openchrome_cursor.c
@@ -38,6 +38,7 @@
#include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_framebuffer.h>
+#include <drm/drm_gem.h>
#include <drm/drm_mode.h>
#include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_plane.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c
b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 6c30a521b688..fb9a6481a28e 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -33,8 +33,11 @@
#include <drm/drm_aperture.h>
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
+#include <drm/drm_gem.h>
#include <drm/drm_pciids.h>
+#include <drm/ttm/ttm_bo_api.h>
+
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 5bbacb3badb7..c7b05ea70c0f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -45,7 +45,6 @@
#include <drm/drm_encoder.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_framebuffer.h>
-#include <drm/drm_gem.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_plane.h>
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c
b/drivers/gpu/drm/openchrome/openchrome_fb.c
index b1bba29d406c..83c4b9332d8e 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -31,6 +31,8 @@
#include <drm/drm_gem.h>
#include <drm_gem_framebuffer_helper.h>
+#include <drm/ttm/ttm_bo_api.h>
+
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c
b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
index 22109188c869..bf56513565c9 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
@@ -28,8 +28,11 @@
* Kevin Brace <kevinbr...@gmx.com>
*/
+#include <drm/drm_gem.h>
#include <drm/drm_ioctl.h>
+#include <drm/ttm/ttm_bo_api.h>
+
#include "openchrome_drv.h"
diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c
b/drivers/gpu/drm/openchrome/openchrome_object.c
index db45e38f44e3..4ff37d6a323a 100644
--- a/drivers/gpu/drm/openchrome/openchrome_object.c
+++ b/drivers/gpu/drm/openchrome/openchrome_object.c
@@ -36,6 +36,7 @@
*/
#include <drm/drm_file.h>
+#include <drm/drm_gem.h>
#include <drm/drm_gem_ttm_helper.h>
#include <drm/ttm/ttm_bo_api.h>
commit 8912fa24c231dab45e5cfb2e411aee8ec029606e
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Jan 4 15:48:40 2022 -0600
drm/openchrome: Delete via_connector_set_property()
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_analog.c
b/drivers/gpu/drm/openchrome/openchrome_analog.c
index 159687d256b8..b55f5ea75e0f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_analog.c
+++ b/drivers/gpu/drm/openchrome/openchrome_analog.c
@@ -279,7 +279,6 @@ static const struct drm_connector_funcs
via_analog_connector_funcs = {
.dpms = drm_helper_connector_dpms,
.detect = via_analog_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
- .set_property = via_connector_set_property,
.destroy = via_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state =
diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c
b/drivers/gpu/drm/openchrome/openchrome_display.c
index e687625dbb46..5d4e827b5f4d 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -272,20 +272,6 @@ via_connector_mode_valid(struct drm_connector *connector,
return MODE_OK;
}
-int
-via_connector_set_property(struct drm_connector *connector,
- struct drm_property *property, uint64_t value)
-{
- struct drm_encoder *encoder = connector->encoder;
- struct drm_device *dev = connector->dev;
-
- if (encoder) {
- if (property == dev->mode_config.dpms_property)
- encoder->helper_private->dpms(encoder, (uint32_t)(value
& 0xf));
- }
- return 0;
-}
-
void
via_connector_destroy(struct drm_connector *connector)
{
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h
b/drivers/gpu/drm/openchrome/openchrome_drv.h
index d501dfb8e1e3..5bbacb3badb7 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -463,9 +463,6 @@ extern void via_encoder_disable(struct drm_encoder
*encoder);
extern void via_encoder_commit(struct drm_encoder *encoder);
/* connectors */
-extern int via_connector_set_property(struct drm_connector *connector,
- struct drm_property *property,
- uint64_t value);
extern int via_connector_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode);
extern void via_connector_destroy(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/openchrome/openchrome_sii164.c
b/drivers/gpu/drm/openchrome/openchrome_sii164.c
index aee0f9bd0e5e..ec3fb06095bb 100644
--- a/drivers/gpu/drm/openchrome/openchrome_sii164.c
+++ b/drivers/gpu/drm/openchrome/openchrome_sii164.c
@@ -384,7 +384,6 @@ static const struct drm_connector_funcs
openchrome_sii164_drm_connector_funcs =
.dpms = drm_helper_connector_dpms,
.detect = openchrome_sii164_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
- .set_property = via_connector_set_property,
.destroy = via_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state =
diff --git a/drivers/gpu/drm/openchrome/openchrome_tmds.c
b/drivers/gpu/drm/openchrome/openchrome_tmds.c
index e9bade37e785..b4b3a9301cd2 100644
--- a/drivers/gpu/drm/openchrome/openchrome_tmds.c
+++ b/drivers/gpu/drm/openchrome/openchrome_tmds.c
@@ -356,7 +356,6 @@ static const struct drm_connector_funcs
via_dvi_connector_funcs = {
.dpms = drm_helper_connector_dpms,
.detect = via_tmds_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
- .set_property = via_connector_set_property,
.destroy = via_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state =
diff --git a/drivers/gpu/drm/openchrome/openchrome_vt1632.c
b/drivers/gpu/drm/openchrome/openchrome_vt1632.c
index f7c9a7eb7ba0..c2ace7e257dd 100644
--- a/drivers/gpu/drm/openchrome/openchrome_vt1632.c
+++ b/drivers/gpu/drm/openchrome/openchrome_vt1632.c
@@ -404,7 +404,6 @@ static const struct drm_connector_funcs
openchrome_vt1632_drm_connector_funcs =
.dpms = drm_helper_connector_dpms,
.detect = openchrome_vt1632_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
- .set_property = via_connector_set_property,
.destroy = via_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state =
