mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor-fbdev: simplify FB destroy/unmap/disable 

Rename fbdev_frame_buffer_destroy() to fbdev_frame_buffer_unmap()
because that is what it does. Adding the destruction of hw_surface in it
makes it the perfect counterpart to fbdev_frame_buffer_map() which
simplifies the code.

fbdev_frame_buffer_map() can no longer call that, so just open-code the
munmap() there. It is an error path, we don't really care about
failures in an error path.

The error path of fbdev_output_enable() is converted to call
buffer_unmap() since that is exactly what it did.

fbdev_output_disable() became redundant, being identical to
fbdev_frame_buffer_unmap().

Invariant: output->hw_surface cannot be non-NULL without output->fb
being non-NULL. hw_surface wraps the mmapped memory so cannot exist
without the mmap.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Acked-by Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen 2017-09-13 17:14:19 +03:00
parent 82db6b79a3
commit a51e71fbf0
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libweston/compositor-fbdev.c
View File

@ -40,6 +40,7 @@
#include <unistd.h>
#include <linux/fb.h>
#include <linux/input.h>
#include <assert.h>
#include <libudev.h>
@ -334,8 +335,6 @@ fbdev_set_screen_info(int fd, struct fbdev_screeninfo *info)
return 1;
}
static void fbdev_frame_buffer_destroy(struct fbdev_output *output);
/* Returns an FD for the frame buffer device. */
static int
fbdev_frame_buffer_open(const char *fb_dev,
@ -400,8 +399,10 @@ fbdev_frame_buffer_map(struct fbdev_output *output, int fd)
retval = 0;
out_unmap:
if (retval != 0 && output->fb != NULL)
fbdev_frame_buffer_destroy(output);
if (retval != 0 && output->fb != NULL) {
munmap(output->fb, output->fb_info.buffer_length);
output->fb = NULL;
}
out_close:
if (fd >= 0)
@ -411,9 +412,18 @@ out_close:
}
static void
fbdev_frame_buffer_destroy(struct fbdev_output *output)
fbdev_frame_buffer_unmap(struct fbdev_output *output)
{
weston_log("Destroying fbdev frame buffer.\n");
if (!output->fb) {
assert(!output->hw_surface);
return;
}
weston_log("Unmapping fbdev frame buffer.\n");
if (output->hw_surface)
pixman_image_unref(output->hw_surface);
output->hw_surface = NULL;
if (munmap(output->fb, output->fb_info.buffer_length) < 0)
weston_log("Failed to munmap frame buffer: %s\n",
@ -423,7 +433,6 @@ fbdev_frame_buffer_destroy(struct fbdev_output *output)
}
static void fbdev_output_destroy(struct weston_output *base);
static void fbdev_output_disable(struct weston_output *base);
static int
fbdev_output_enable(struct weston_output *base)
@ -463,9 +472,7 @@ fbdev_output_enable(struct weston_output *base)
return 0;
out_hw_surface:
pixman_image_unref(output->hw_surface);
output->hw_surface = NULL;
fbdev_frame_buffer_destroy(output);
fbdev_frame_buffer_unmap(output);
return -1;
}
@ -473,11 +480,12 @@ out_hw_surface:
static int
fbdev_output_disable_handler(struct weston_output *base)
{
struct fbdev_output *output = to_fbdev_output(base);
if (!base->enabled)
return 0;
/* Close the frame buffer. */
fbdev_output_disable(base);
fbdev_frame_buffer_unmap(output);
if (base->renderer_state != NULL)
pixman_renderer_output_destroy(base);
@ -628,24 +636,6 @@ err:
return -1;
}
/* NOTE: This leaves output->fb_info populated, caching data so that if
* fbdev_output_reenable() is called again, it can determine whether a mode-set
* is needed. */
static void
fbdev_output_disable(struct weston_output *base)
{
struct fbdev_output *output = to_fbdev_output(base);
weston_log("Disabling fbdev output.\n");
if (output->hw_surface != NULL) {
pixman_image_unref(output->hw_surface);
output->hw_surface = NULL;
}
fbdev_frame_buffer_destroy(output);
}
static void
fbdev_backend_destroy(struct weston_compositor *base)
{
@ -687,7 +677,7 @@ session_notify(struct wl_listener *listener, void *data)
udev_input_disable(&backend->input);
wl_list_for_each(output, &compositor->output_list, link) {
fbdev_output_disable(output);
fbdev_frame_buffer_unmap(to_fbdev_output(output));
}
backend->prev_state = compositor->state;