drivers/gpu/drm/via/via_cursor.c | 18 +-----------------
drivers/gpu/drm/via/via_drv.c | 1 -
drivers/gpu/drm/via/via_drv.h | 4 ++--
drivers/gpu/drm/via/via_i2c.c | 15 +++++++++++----
drivers/gpu/drm/via/via_lvds.c | 3 +++
5 files changed, 17 insertions(+), 24 deletions(-)
New commits:
commit 8a681dc487ab446eea53ceb0ea2b154638402d2b
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Feb 24 10:35:45 2023 -0800
drm/via: Version bumped to 3.6.4
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 2f916891dbd0..380cbffc88f9 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -44,10 +44,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 6
-#define DRIVER_PATCHLEVEL 3
+#define DRIVER_PATCHLEVEL 4
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE "20230201"
+#define DRIVER_DATE "20230224"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 5de9451192b8f69c4bf233aab8b34cd7e7fa023e
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Feb 24 10:33:02 2023 -0800
drm/via: Remove excess kernel logging when displaying the cursor
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 9a0c1fd9ff1c..ac7a8c475623 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -259,8 +259,6 @@ static int via_cursor_prepare_fb(struct drm_plane *plane,
struct via_bo *bo;
int ret = 0;
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
if (!new_state->fb) {
goto exit;
}
@@ -282,7 +280,6 @@ static int via_cursor_prepare_fb(struct drm_plane *plane,
}
exit:
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
}
@@ -294,8 +291,6 @@ static void via_cursor_cleanup_fb(struct drm_plane *plane,
struct via_bo *bo;
int ret;
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
if (!old_state->fb) {
goto exit;
}
@@ -314,7 +309,7 @@ static void via_cursor_cleanup_fb(struct drm_plane *plane,
ttm_bo_unreserve(ttm_bo);
exit:
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+ return;
}
static int via_cursor_atomic_check(struct drm_plane *plane,
@@ -326,8 +321,6 @@ static int via_cursor_atomic_check(struct drm_plane *plane,
struct drm_framebuffer *fb = new_plane_state->fb;
int ret = 0;
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
if ((!new_plane_state->crtc) || (!new_plane_state->visible)) {
goto exit;
}
@@ -348,7 +341,6 @@ static int via_cursor_atomic_check(struct drm_plane *plane,
DRM_PLANE_NO_SCALING,
true, true);
exit:
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
}
@@ -363,8 +355,6 @@ static void via_cursor_atomic_update(struct drm_plane
*plane,
struct drm_gem_object *gem;
struct ttm_buffer_object *ttm_bo;
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
if (new_state->fb != old_state->fb) {
gem = new_state->fb->obj[0];
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
@@ -373,8 +363,6 @@ static void via_cursor_atomic_update(struct drm_plane
*plane,
via_set_hi_location(crtc, new_state->crtc_x, new_state->crtc_y);
via_show_cursor(crtc);
-
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
void via_cursor_atomic_disable(struct drm_plane *plane,
@@ -384,13 +372,9 @@ void via_cursor_atomic_disable(struct drm_plane *plane,
drm_atomic_get_new_plane_state(state, plane);
struct drm_crtc *crtc = new_state->crtc;
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
if (crtc) {
via_hide_cursor(crtc);
}
-
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
const struct drm_plane_helper_funcs via_cursor_drm_plane_helper_funcs = {
commit b38fcaa39d6fd9ae9e9fd633210e39e661beb674
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Feb 24 10:30:45 2023 -0800
drm/via: Stop including linux/via_i2c.h
Copy some code from it into via_i2c.c.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index c52e9a77a547..c87b46941420 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -16,13 +16,16 @@
#include "via_drv.h"
-enum viafb_i2c_adap;
-
-#include <linux/via_i2c.h>
-
#define SERIAL 0
#define GPIO 1
+struct via_i2c_stuff {
+ u16 i2c_port; /* GPIO or I2C port */
+ u16 is_active; /* Being used as I2C? */
+ struct i2c_adapter adapter;
+ struct i2c_algo_bit_data algo;
+};
+
static struct via_i2c_stuff via_i2c_par[5];
static void via_i2c_setsda(void *data, int state)
commit 3a08253b825e9f98c506247c47dfeabbc073df97
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Feb 24 10:23:09 2023 -0800
drm/via: Include I2C bus headers explicitly
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index f2e8b118754e..c52e9a77a547 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -9,6 +9,10 @@
*/
#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+
+#include <uapi/linux/i2c.h>
#include "via_drv.h"
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index cf8ee1b0df49..c0f5248cb475 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -29,6 +29,7 @@
*/
#include <linux/delay.h>
+#include <linux/i2c.h>
#include <linux/pci.h>
#include <asm/olpc.h>
@@ -39,6 +40,8 @@
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
+#include <uapi/linux/i2c.h>
+
#include "via_drv.h"
#define TD0 200
commit 900a2e1ee4b74cf62aef79fd7355183949e89384
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Feb 24 09:50:56 2023 -0800
drm/via: Stop including drm/drm_pciids.h
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index e3b61e61f28c..d8485e7d2d96 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -35,7 +35,6 @@
#include <drm/drm_file.h>
#include <drm/drm_gem.h>
#include <drm/drm_ioctl.h>
-#include <drm/drm_pciids.h>
#include <drm/drm_prime.h>
#include <drm/ttm/ttm_bo_api.h>
