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

Commit e991077e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Properly track domain of the fbcon fb 



X could end up putting the fbcon fb into other domains, e.g.
for smooth take-overs. Also we want this for accurate frontbuffer
tracking: The set_config is an implicit flush and will re-enable
psr and similar features, so we need to bring the bo back into
the gtt domain.

v2: Add FIXME comment about fbcon locking fun in atomic context,
requested by Chris.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d5a81ef1

drivers/gpu/drm/i915/intel_fbdev.c

+27 −1
Original line number Diff line number Diff line
@@ -43,10 +43,36 @@ 
#include <drm/i915_drm.h>

#include "i915_drv.h"



static int intel_fbdev_set_par(struct fb_info *info)

{

	struct drm_fb_helper *fb_helper = info->par;

	struct intel_fbdev *ifbdev =

		container_of(fb_helper, struct intel_fbdev, helper);

	int ret;



	ret = drm_fb_helper_set_par(info);



	if (ret == 0) {

		/*

		 * FIXME: fbdev presumes that all callbacks also work from

		 * atomic contexts and relies on that for emergency oops

		 * printing. KMS totally doesn't do that and the locking here is

		 * by far not the only place this goes wrong.  Ignore this for

		 * now until we solve this for real.

		 */

		mutex_lock(&fb_helper->dev->struct_mutex);

		ret = i915_gem_object_set_to_gtt_domain(ifbdev->fb->obj,

							true);

		mutex_unlock(&fb_helper->dev->struct_mutex);

	}



	return ret;

}



static struct fb_ops intelfb_ops = {

	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_set_par = intel_fbdev_set_par,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,