blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: drop wlr_drm_connector.desired_mode 

Previously used by attempt_enable_needs_modeset, but this has been
dropped in the previous commit.
This commit is contained in:
Simon Ser 2021-09-07 11:31:10 +02:00 committed by Kenny Levinsen
parent b01d97a38f
commit 42dba9dc90
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/drm/drm.c
View File

@ -689,7 +689,6 @@ static bool drm_connector_set_mode(struct wlr_drm_connector *conn,
} }
conn->desired_enabled = wlr_mode != NULL; conn->desired_enabled = wlr_mode != NULL;
conn->desired_mode = wlr_mode;
if (wlr_mode == NULL) { if (wlr_mode == NULL) {
if (conn->crtc != NULL) { if (conn->crtc != NULL) {
@ -730,7 +729,6 @@ static bool drm_connector_set_mode(struct wlr_drm_connector *conn,
} }
conn->status = WLR_DRM_CONN_CONNECTED; conn->status = WLR_DRM_CONN_CONNECTED;
conn->desired_mode = NULL;
wlr_output_update_mode(&conn->output, wlr_mode); wlr_output_update_mode(&conn->output, wlr_mode);
wlr_output_update_enabled(&conn->output, true); wlr_output_update_enabled(&conn->output, true);
conn->desired_enabled = true; conn->desired_enabled = true;
@ -904,7 +902,6 @@ static void drm_connector_destroy_output(struct wlr_output *output) {
conn->status = WLR_DRM_CONN_DISCONNECTED; conn->status = WLR_DRM_CONN_DISCONNECTED;
conn->desired_enabled = false; conn->desired_enabled = false;
conn->desired_mode = NULL;
conn->possible_crtcs = 0; conn->possible_crtcs = 0;
conn->pending_page_flip_crtc = 0; conn->pending_page_flip_crtc = 0;
@ -1114,7 +1111,6 @@ static void realloc_crtcs(struct wlr_drm_backend *drm) {
wlr_drm_conn_log(conn, WLR_DEBUG, "Output has lost its CRTC"); wlr_drm_conn_log(conn, WLR_DEBUG, "Output has lost its CRTC");
conn->status = WLR_DRM_CONN_NEEDS_MODESET; conn->status = WLR_DRM_CONN_NEEDS_MODESET;
wlr_output_update_enabled(&conn->output, false); wlr_output_update_enabled(&conn->output, false);
conn->desired_mode = conn->output.current_mode;
wlr_output_update_mode(&conn->output, NULL); wlr_output_update_mode(&conn->output, NULL);
} }
continue; continue;

1
include/backend/drm/drm.h
View File

@ -117,7 +117,6 @@ struct wlr_drm_connector {
struct wlr_drm_backend *backend; struct wlr_drm_backend *backend;
char name[24]; char name[24];
enum wlr_drm_connector_status status; enum wlr_drm_connector_status status;
struct wlr_output_mode *desired_mode;
bool desired_enabled; bool desired_enabled;
uint32_t id; uint32_t id;