mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Remove NULL checks in switch_mode

Browse Source 
Calling switch_mode with no output or mode never makes any sense. Drop
the NULL checks.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Daniel Stone
2017-10-07 14:01:45 +01:00
parent e2e8013633
commit 02d487a590
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+5 -18
View File
@@ -2593,26 +2593,13 @@ drm_output_fini_pixman(struct drm_output *output);
static int static int
drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mode) drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mode)
{ {
struct drm_output *output; struct drm_output *output = to_drm_output(output_base);
struct drm_mode *drm_mode; struct drm_backend *b = to_drm_backend(output_base->compositor);
struct drm_backend *b; struct drm_mode *drm_mode = choose_mode(output, mode);
if (output_base == NULL) {
weston_log("output is NULL.\n");
return -1;
}
if (mode == NULL) {
weston_log("mode is NULL.\n");
return -1;
}
b = to_drm_backend(output_base->compositor);
output = to_drm_output(output_base);
drm_mode = choose_mode (output, mode);
if (!drm_mode) { if (!drm_mode) {
weston_log("%s, invalid resolution:%dx%d\n", __func__, mode->width, mode->height); weston_log("%s: invalid resolution %dx%d\n",
output_base->name, mode->width, mode->height);
return -1; return -1;
} }