Commit 91ef7f4c authored by Dave Stevenson's avatar Dave Stevenson Committed by Maxime Ripard

drm/vc4: dsi: Convert to use atomic operations

The atomic calls are preferred as the non-atomic ones
are deprecated. In preparation for conversion to a bridge,
switch to the atomic calls.
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20221207-rpi-dsi-bridge-v1-4-8f68ee0b0adb@cerno.techSigned-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent f79522e4
...@@ -796,7 +796,8 @@ dsi_esc_timing(u32 ns) ...@@ -796,7 +796,8 @@ dsi_esc_timing(u32 ns)
return DIV_ROUND_UP(ns, ESC_TIME_NS); return DIV_ROUND_UP(ns, ESC_TIME_NS);
} }
static void vc4_dsi_encoder_disable(struct drm_encoder *encoder) static void vc4_dsi_encoder_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct vc4_dsi *dsi = to_vc4_dsi(encoder); struct vc4_dsi *dsi = to_vc4_dsi(encoder);
struct device *dev = &dsi->pdev->dev; struct device *dev = &dsi->pdev->dev;
...@@ -860,17 +861,18 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, ...@@ -860,17 +861,18 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
} }
static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder, static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode, struct drm_crtc_state *crtc_state,
struct drm_display_mode *adjusted_mode) struct drm_connector_state *conn_state)
{ {
struct vc4_dsi *dsi = to_vc4_dsi(encoder); struct vc4_dsi *dsi = to_vc4_dsi(encoder);
struct device *dev = &dsi->pdev->dev; struct device *dev = &dsi->pdev->dev;
const struct drm_display_mode *mode;
bool debug_dump_regs = false; bool debug_dump_regs = false;
unsigned long hs_clock; unsigned long hs_clock;
u32 ui_ns; u32 ui_ns;
/* Minimum LP state duration in escape clock cycles. */ /* Minimum LP state duration in escape clock cycles. */
u32 lpx = dsi_esc_timing(60); u32 lpx = dsi_esc_timing(60);
unsigned long pixel_clock_hz = adjusted_mode->clock * 1000; unsigned long pixel_clock_hz;
unsigned long dsip_clock; unsigned long dsip_clock;
unsigned long phy_clock; unsigned long phy_clock;
int ret; int ret;
...@@ -887,6 +889,10 @@ static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder, ...@@ -887,6 +889,10 @@ static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
drm_print_regset32(&p, &dsi->regset); drm_print_regset32(&p, &dsi->regset);
} }
mode = &crtc_state->adjusted_mode;
pixel_clock_hz = mode->clock * 1000;
/* Round up the clk_set_rate() request slightly, since /* Round up the clk_set_rate() request slightly, since
* PLLD_DSI1 is an integer divider and its rate selection will * PLLD_DSI1 is an integer divider and its rate selection will
* never round up. * never round up.
...@@ -1099,7 +1105,8 @@ static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder, ...@@ -1099,7 +1105,8 @@ static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
vc4_dsi_ulps(dsi, false); vc4_dsi_ulps(dsi, false);
} }
static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) static void vc4_dsi_encoder_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{ {
struct vc4_dsi *dsi = to_vc4_dsi(encoder); struct vc4_dsi *dsi = to_vc4_dsi(encoder);
bool debug_dump_regs = false; bool debug_dump_regs = false;
...@@ -1355,10 +1362,10 @@ static const struct mipi_dsi_host_ops vc4_dsi_host_ops = { ...@@ -1355,10 +1362,10 @@ static const struct mipi_dsi_host_ops vc4_dsi_host_ops = {
}; };
static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
.disable = vc4_dsi_encoder_disable, .atomic_disable = vc4_dsi_encoder_disable,
.enable = vc4_dsi_encoder_enable, .atomic_enable = vc4_dsi_encoder_enable,
.mode_fixup = vc4_dsi_encoder_mode_fixup, .mode_fixup = vc4_dsi_encoder_mode_fixup,
.mode_set = vc4_dsi_encoder_mode_set, .atomic_mode_set = vc4_dsi_encoder_mode_set,
}; };
static int vc4_dsi_late_register(struct drm_encoder *encoder) static int vc4_dsi_late_register(struct drm_encoder *encoder)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment