From 61095f4a12461944a400094be6cfa677da7c9928 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 18 May 2020 12:19:53 +0200
Subject: backend/drm: make drm_connector_set_mode take a wlr_drm_connector
Since this is an internal DRM backend function, there's no reason we
need to take a generic wlr_output.
---
backend/drm/backend.c | 5 ++---
backend/drm/drm.c | 12 ++++++------
2 files changed, 8 insertions(+), 9 deletions(-)
(limited to 'backend')
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 2a42ee73..da6e1ebc 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -94,10 +94,9 @@ static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link){
if (conn->output.enabled && conn->output.current_mode != NULL) {
- drm_connector_set_mode(&conn->output,
- conn->output.current_mode);
+ drm_connector_set_mode(conn, conn->output.current_mode);
} else {
- drm_connector_set_mode(&conn->output, NULL);
+ drm_connector_set_mode(conn, NULL);
}
}
} else {
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index b5f3a7b9..630a7532 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -564,7 +564,7 @@ static bool drm_connector_commit(struct wlr_output *output) {
}
}
- if (!drm_connector_set_mode(output, wlr_mode)) {
+ if (!drm_connector_set_mode(conn, wlr_mode)) {
return false;
}
}
@@ -770,17 +770,17 @@ static void attempt_enable_needs_modeset(struct wlr_drm_backend *drm) {
conn->desired_enabled) {
wlr_log(WLR_DEBUG, "Output %s has a desired mode and a CRTC, "
"attempting a modeset", conn->output.name);
- drm_connector_set_mode(&conn->output, conn->desired_mode);
+ drm_connector_set_mode(conn, conn->desired_mode);
}
}
}
static void drm_connector_cleanup(struct wlr_drm_connector *conn);
-bool drm_connector_set_mode(struct wlr_output *output,
+bool drm_connector_set_mode(struct wlr_drm_connector *conn,
struct wlr_output_mode *wlr_mode) {
- struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
- struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend);
+ struct wlr_drm_backend *drm =
+ get_drm_backend_from_backend(conn->output.backend);
conn->desired_enabled = wlr_mode != NULL;
conn->desired_mode = wlr_mode;
@@ -1061,7 +1061,7 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) {
wlr_log(WLR_DEBUG, "De-allocating CRTC %zu for output '%s'",
conn->crtc - drm->crtcs, conn->output.name);
- drm_connector_set_mode(&conn->output, NULL);
+ drm_connector_set_mode(conn, NULL);
drm_plane_finish_surface(conn->crtc->primary);
drm_plane_finish_surface(conn->crtc->cursor);
if (conn->crtc->cursor != NULL) {
--
cgit v1.2.3