Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cb72b17 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

drm: Catch stop possible NULL pointer reference 



This was caught by Weiss. Also added some comments to the
fb_changed and mode_changed variables to explain what they do.

Signed-off-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Tested-by: default avatarThomas White <taw@bitwiz.org.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7781de74

drivers/gpu/drm/drm_crtc_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -706,8 +706,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
	struct drm_encoder **save_encoders, *new_encoder;

	struct drm_framebuffer *old_fb = NULL;

	bool save_enabled;

	bool mode_changed = false;

	bool fb_changed = false;

	bool mode_changed = false; /* if true do a full mode set */

	bool fb_changed = false; /* if true and !mode_changed just do a flip */

	struct drm_connector *connector;

	int count = 0, ro, fail = 0;

	struct drm_crtc_helper_funcs *crtc_funcs;
@@ -758,6 +758,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
		if (set->crtc->fb == NULL) {

			DRM_DEBUG("crtc has no fb, full mode set\n");

			mode_changed = true;

		} else if (set->fb == NULL) {

			mode_changed = true;

		} else if ((set->fb->bits_per_pixel !=

			 set->crtc->fb->bits_per_pixel) ||

			 set->fb->depth != set->crtc->fb->depth)