diff options
Diffstat (limited to 'backend/drm/backend.c')
| -rw-r--r-- | backend/drm/backend.c | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 66cb89d3..5dc8a119 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -17,7 +17,7 @@  static bool wlr_drm_backend_start(struct wlr_backend *backend) {  	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend; -	wlr_drm_scan_connectors(drm); +	drm_scan_connectors(drm);  	return true;  } @@ -28,7 +28,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {  	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend; -	wlr_drm_restore_outputs(drm); +	drm_restore_outputs(drm);  	struct wlr_drm_connector *conn, *next;  	wl_list_for_each_safe(conn, next, &drm->outputs, link) { @@ -41,8 +41,8 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {  	wl_list_remove(&drm->session_signal.link);  	wl_list_remove(&drm->drm_invalidated.link); -	wlr_drm_resources_free(drm); -	wlr_drm_renderer_finish(&drm->renderer); +	drm_resources_finish(drm); +	drm_renderer_finish(&drm->renderer);  	wlr_session_close_file(drm->session, drm->fd);  	wl_event_source_remove(drm->drm_event);  	free(drm); @@ -71,14 +71,14 @@ static void session_signal(struct wl_listener *listener, void *data) {  	if (session->active) {  		wlr_log(L_INFO, "DRM fd resumed"); -		wlr_drm_scan_connectors(drm); +		drm_scan_connectors(drm);  		struct wlr_drm_connector *conn;  		wl_list_for_each(conn, &drm->outputs, link){  			if (conn->output.enabled) {  				wlr_output_set_mode(&conn->output, conn->output.current_mode);  			} else { -				wlr_drm_connector_enable(&conn->output, false); +				drm_connector_enable(&conn->output, false);  			}  			if (!conn->crtc) { @@ -104,7 +104,7 @@ static void drm_invalidated(struct wl_listener *listener, void *data) {  	wlr_log(L_DEBUG, "%s invalidated", name);  	free(name); -	wlr_drm_scan_connectors(drm); +	drm_scan_connectors(drm);  }  static void handle_display_destroy(struct wl_listener *listener, void *data) { @@ -144,7 +144,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,  	struct wl_event_loop *event_loop = wl_display_get_event_loop(display);  	drm->drm_event = wl_event_loop_add_fd(event_loop, drm->fd, -		WL_EVENT_READABLE, wlr_drm_event, NULL); +		WL_EVENT_READABLE, drm_event, NULL);  	if (!drm->drm_event) {  		wlr_log(L_ERROR, "Failed to create DRM event source");  		goto error_fd; @@ -153,15 +153,15 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,  	drm->session_signal.notify = session_signal;  	wl_signal_add(&session->session_signal, &drm->session_signal); -	if (!wlr_drm_check_features(drm)) { +	if (!drm_check_features(drm)) {  		goto error_event;  	} -	if (!wlr_drm_resources_init(drm)) { +	if (!drm_resources_init(drm)) {  		goto error_event;  	} -	if (!wlr_drm_renderer_init(drm, &drm->renderer)) { +	if (!drm_renderer_init(drm, &drm->renderer)) {  		wlr_log(L_ERROR, "Failed to initialize renderer");  		goto error_event;  	} | 
