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

Commit 79b33494 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2017-02-09' of... 

Merge tag 'drm-misc-next-fixes-2017-02-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next

Just 3 bugfixes for 4.11 merge window:

- fbdev module unload oops fix from Chris
- patch from Dan that look really dangers, better safe than sorry

* tag 'drm-misc-next-fixes-2017-02-09' of git://anongit.freedesktop.org/git/drm-misc:
  drm/atomic: fix an error code in mode_fixup()
  drm: Cancel drm_fb_helper_resume_work on unload
  drm: Cancel drm_fb_helper_dirty_work on unload
parents f864b00e f9ad86e4

drivers/gpu/drm/drm_atomic_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ mode_fixup(struct drm_atomic_state *state) 
	struct drm_connector *connector;

	struct drm_connector_state *conn_state;

	int i;

	bool ret;

	int ret;



	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		if (!crtc_state->mode_changed &&

drivers/gpu/drm/drm_fb_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -860,6 +860,9 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) 
	if (!drm_fbdev_emulation)

		return;



	cancel_work_sync(&fb_helper->resume_work);

	cancel_work_sync(&fb_helper->dirty_work);



	mutex_lock(&kernel_fb_helper_lock);

	if (!list_empty(&fb_helper->kernel_fb_list)) {

		list_del(&fb_helper->kernel_fb_list);