From 1543e317f1da31b75942316931e8f491a8920811 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Thu, 04 Jan 2024 10:08:02 +0000
Subject: [PATCH] disable FB
---
kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c b/kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c
index ca13750..9dc9e10 100644
--- a/kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c
+++ b/kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c
@@ -15,7 +15,7 @@
#include <linux/regmap.h>
#include <drm/drm_of.h>
-#include <drm/drmP.h>
+#include <drm/drm_drv.h>
#include <video/videomode.h>
#define RK618_VIF0_REG0 0x0000
@@ -145,15 +145,16 @@
}
static void rk618_vif_bridge_mode_set(struct drm_bridge *bridge,
- struct drm_display_mode *mode,
- struct drm_display_mode *adjusted)
+ const struct drm_display_mode *mode,
+ const struct drm_display_mode *adjusted)
{
struct rk618_vif *vif = bridge_to_vif(bridge);
drm_mode_copy(&vif->mode, adjusted);
}
-static int rk618_vif_bridge_attach(struct drm_bridge *bridge)
+static int rk618_vif_bridge_attach(struct drm_bridge *bridge,
+ enum drm_bridge_attach_flags flags)
{
struct rk618_vif *vif = bridge_to_vif(bridge);
struct device *dev = vif->dev;
@@ -174,7 +175,7 @@
if (!vif->bridge)
return -EPROBE_DEFER;
- ret = drm_bridge_attach(bridge->encoder, vif->bridge, bridge);
+ ret = drm_bridge_attach(bridge->encoder, vif->bridge, bridge, 0);
if (ret) {
dev_err(dev, "failed to attach bridge\n");
return ret;
--
Gitblit v1.6.2