WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_fb_helper.c

 #include
 #include
 #include
 #include
 #include
+#include
+#include
+static bool drm_fbdev_emulation = true;
+module_param_named(fbdev_emulation, drm_fbdev_emulation, bool, 0600);
+MODULE_PARM_DESC(fbdev_emulation,
+		 "Enable legacy fbdev emulation [default=true]");
 static LIST_HEAD(kernel_fb_helper_list);
  * drm_fb_helper_initial_config(). Drivers with fancier requirements than the
  * default behaviour can override the third step with their own code.
  * Teardown is done with drm_fb_helper_fini().
+ *
  * At runtime drivers should restore the fbdev console by calling
- * drm_fb_helper_restore_fbdev_mode() from their ->lastclose callback. They
+ * drm_fb_helper_restore_fbdev_mode_unlocked() from their ->lastclose callback.
- * should also notify the fb helper code from updates to the output
+ * They should also notify the fb helper code from updates to the output
  * configuration by calling drm_fb_helper_hotplug_event(). For easier
  * integration with the output polling code in drm_crtc_helper.c the modeset
  * code provides a ->output_poll_changed callback.
+ *
  * All other functions exported by the fb helper library can be used to
  * This functions adds all the available connectors for use with the given
  * fb_helper. This is a separate step to allow drivers to freely assign
  * connectors to the fbdev, e.g. if some are reserved for special purposes or
  * not adequate to be used for the fbcon.
+ *
- * Since this is part of the initial setup before the fbdev is published, no
+ * This function is protected against concurrent connector hotadds/removals
+ * using drm_fb_helper_add_one_connector() and
- * locking is required.
+ * drm_fb_helper_remove_one_connector().
  */
 int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)
+{
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_connector *connector;
 	int i;
+	if (!drm_fbdev_emulation)
+		return 0;
+	mutex_lock(&dev->mode_config.mutex);
-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+	drm_for_each_connector(connector, dev) {
 		struct drm_fb_helper_connector *fb_helper_connector;
 		fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), GFP_KERNEL);
 		if (!fb_helper_connector)
 			goto fail;
+		fb_helper_connector->connector = connector;
-		fb_helper_connector->connector = connector;
+		fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;
 		fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;
 	mutex_unlock(&dev->mode_config.mutex);
 	return 0;
 fail:
 	for (i = 0; i < fb_helper->connector_count; i++) {
 		kfree(fb_helper->connector_info[i]);
+		fb_helper->connector_info[i] = NULL;
+	}
-		fb_helper->connector_info[i] = NULL;
+	fb_helper->connector_count = 0;
 	mutex_unlock(&dev->mode_config.mutex);
 	fb_helper->connector_count = 0;
-    return -ENOMEM;
+	return -ENOMEM;
+}
 EXPORT_SYMBOL(drm_fb_helper_single_add_all_connectors);
+int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector)
+{
+	struct drm_fb_helper_connector **temp;
-int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector)
+	struct drm_fb_helper_connector *fb_helper_connector;
-	struct drm_fb_helper_connector **temp;
+	if (!drm_fbdev_emulation)
-	struct drm_fb_helper_connector *fb_helper_connector;
+		return 0;
 	fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;
 	return 0;
+}
 EXPORT_SYMBOL(drm_fb_helper_add_one_connector);
+static void remove_from_modeset(struct drm_mode_set *set,
+		struct drm_connector *connector)
+{
+	int i, j;
+	for (i = 0; i < set->num_connectors; i++) {
+		if (set->connectors[i] == connector)
+			break;
+	}
+	if (i == set->num_connectors)
+		return;
+	for (j = i + 1; j < set->num_connectors; j++) {
+		set->connectors[j - 1] = set->connectors[j];
+	}
+	set->num_connectors--;
+	/*
+	 * TODO maybe need to makes sure we set it back to !=NULL somewhere?
+	 */
+	if (set->num_connectors == 0) {
+		set->fb = NULL;
+		drm_mode_destroy(connector->dev, set->mode);
+		set->mode = NULL;
+	}
+}
 int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
 				       struct drm_connector *connector)
+{
 	struct drm_fb_helper_connector *fb_helper_connector;
+	int i, j;
+	if (!drm_fbdev_emulation)
-	int i, j;
+		return 0;
 	WARN_ON(!mutex_is_locked(&fb_helper->dev->mode_config.mutex));
 	for (j = i + 1; j < fb_helper->connector_count; j++) {
 		fb_helper->connector_info[j - 1] = fb_helper->connector_info[j];
+	}
 	fb_helper->connector_count--;
 	kfree(fb_helper_connector);
+	/* also cleanup dangling references to the connector: */
+	for (i = 0; i < fb_helper->crtc_count; i++)
+		remove_from_modeset(&fb_helper->crtc_info[i].mode_set, connector);
 	return 0;
+}
 EXPORT_SYMBOL(drm_fb_helper_remove_one_connector);
 	b_base = g_base + crtc->gamma_size;
 	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
+}
+/* Find the real fb for a given fb helper CRTC */
+static struct drm_framebuffer *drm_mode_config_fb(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_crtc *c;
+	drm_for_each_crtc(c, dev) {
+		if (crtc->base.id == c->base.id)
+			return c->primary->fb;
+	}
+	return NULL;
+}
+static int restore_fbdev_mode_atomic(struct drm_fb_helper *fb_helper)
+{
+	struct drm_device *dev = fb_helper->dev;
+	struct drm_plane *plane;
+	struct drm_atomic_state *state;
+	int i, ret;
+	unsigned plane_mask;
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+	state->acquire_ctx = dev->mode_config.acquire_ctx;
+retry:
+	plane_mask = 0;
+	drm_for_each_plane(plane, dev) {
+		struct drm_plane_state *plane_state;
+		plane_state = drm_atomic_get_plane_state(state, plane);
+		if (IS_ERR(plane_state)) {
+			ret = PTR_ERR(plane_state);
+			goto fail;
+		}
+		plane_state->rotation = BIT(DRM_ROTATE_0);
+		plane->old_fb = plane->fb;
+		plane_mask |= 1 << drm_plane_index(plane);
+		/* disable non-primary: */
+		if (plane->type == DRM_PLANE_TYPE_PRIMARY)
+			continue;
+		ret = __drm_atomic_helper_disable_plane(plane, plane_state);
+		if (ret != 0)
+			goto fail;
+	}
+	for(i = 0; i < fb_helper->crtc_count; i++) {
+		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
+		ret = __drm_atomic_helper_set_config(mode_set, state);
+		if (ret != 0)
+			goto fail;
+	}
+	ret = drm_atomic_commit(state);
+fail:
+	drm_atomic_clean_old_fb(dev, plane_mask, ret);
+	if (ret == -EDEADLK)
+		goto backoff;
+	if (ret != 0)
+		drm_atomic_state_free(state);
+	return ret;
+backoff:
+	drm_atomic_state_clear(state);
+	drm_atomic_legacy_backoff(state);
-}
+	goto retry;
+}
-static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
+static int restore_fbdev_mode(struct drm_fb_helper *fb_helper)
-{
 	struct drm_device *dev = fb_helper->dev;
-	struct drm_plane *plane;
+	struct drm_device *dev = fb_helper->dev;
+	struct drm_plane *plane;
+	int i;
-	bool error = false;
+	drm_warn_on_modeset_not_all_locked(dev);
 	int i;
 	if (fb_helper->atomic)
-	drm_warn_on_modeset_not_all_locked(dev);
+		return restore_fbdev_mode_atomic(fb_helper);
 	for (i = 0; i < fb_helper->crtc_count; i++) {
 		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
 		struct drm_crtc *crtc = mode_set->crtc;
 		int ret;
+		if (crtc->funcs->cursor_set2) {
+			ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0);
+			if (ret)
+				return ret;
-		if (crtc->funcs->cursor_set) {
+		} else if (crtc->funcs->cursor_set) {
 			ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
 			if (ret)
-				error = true;
+				return ret;
+		}
 		ret = drm_mode_set_config_internal(mode_set);
 		if (ret)
+			return ret;
-			error = true;
+	}
+	return 0;
 	return error;
 /**
  * drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration
  * @fb_helper: fbcon to restore
+ *
  * This should be called from driver's drm ->lastclose callback
+ * when implementing an fbcon on top of kms using this helper. This ensures that
+ * the user isn't greeted with a black screen when e.g. X dies.
+ *
- * when implementing an fbcon on top of kms using this helper. This ensures that
+ * RETURNS:
- * the user isn't greeted with a black screen when e.g. X dies.
+ * Zero if everything went ok, negative error code otherwise.
  */
-bool drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
+int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
+{
-{
+	struct drm_device *dev = fb_helper->dev;
+	bool do_delayed;
-	struct drm_device *dev = fb_helper->dev;
+	int ret;
-	bool ret;
+	if (!drm_fbdev_emulation)
-	bool do_delayed = false;
+		return -ENODEV;
+	drm_modeset_lock_all(dev);
+	ret = restore_fbdev_mode(fb_helper);
 	do_delayed = fb_helper->delayed_hotplug;
+	if (do_delayed)
+		fb_helper->delayed_hotplug = false;
+	drm_modeset_unlock_all(dev);
 	drm_modeset_lock_all(dev);
-	ret = restore_fbdev_mode(fb_helper);
+	if (do_delayed)
-	drm_modeset_unlock_all(dev);
+		drm_fb_helper_hotplug_event(fb_helper);
 	return ret;
+}
 EXPORT_SYMBOL(drm_fb_helper_restore_fbdev_mode_unlocked);
 static bool drm_fb_helper_is_bound(struct drm_fb_helper *fb_helper)
+{
+	struct drm_device *dev = fb_helper->dev;
+	struct drm_crtc *crtc;
+	int bound = 0, crtcs_bound = 0;
-{
+	/* Sometimes user space wants everything disabled, so don't steal the
-	struct drm_device *dev = fb_helper->dev;
+	 * display if there's a master. */
-	struct drm_crtc *crtc;
+	if (dev->primary->master)
-	int bound = 0, crtcs_bound = 0;
+		return false;
-	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+	drm_for_each_crtc(crtc, dev) {
 	struct drm_crtc *crtc;
 	struct drm_connector *connector;
 	int i, j;
-	/*
-	 * fbdev->blank can be called from irq context in case of a panic.
-	 * Since we already have our own special panic handler which will
-	 * restore the fbdev console mode completely, just bail out early.
-	 */
 	/*
 	 * For each CRTC in this fb, turn the connectors on/off.
 	 */
 	drm_modeset_lock_all(dev);
 	if (!drm_fb_helper_is_bound(fb_helper)) {
  * @blank: desired blanking state
  * @info: fbdev registered by the helper
  */
 int drm_fb_helper_blank(int blank, struct fb_info *info)
+{
+	if (oops_in_progress)
+		return -EBUSY;
 	switch (blank) {
 	/* Display: On; HSync: On, VSync: On */
 	case FB_BLANK_UNBLANK:
 		drm_fb_helper_dpms(info, DRM_MODE_DPMS_ON);
 		break;
 		       int crtc_count, int max_conn_count)
+{
 	struct drm_crtc *crtc;
 	int i;
+	if (!drm_fbdev_emulation)
+		return 0;
 	if (!max_conn_count)
 		return -EINVAL;
 			goto out_free;
 		fb_helper->crtc_info[i].mode_set.num_connectors = 0;
+	}
 	i = 0;
-	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+	drm_for_each_crtc(crtc, dev) {
 		fb_helper->crtc_info[i].mode_set.crtc = crtc;
 		i++;
+	}
 	fb_helper->atomic = !!drm_core_check_feature(dev, DRIVER_ATOMIC);
 	return 0;
 out_free:
 	drm_fb_helper_crtc_free(fb_helper);
 	return -ENOMEM;
+}
+EXPORT_SYMBOL(drm_fb_helper_init);
+/**
+ * drm_fb_helper_alloc_fbi - allocate fb_info and some of its members
+ * @fb_helper: driver-allocated fbdev helper
+ *
+ * A helper to alloc fb_info and the members cmap and apertures. Called
+ * by the driver within the fb_probe fb_helper callback function.
+ *
+ * RETURNS:
+ * fb_info pointer if things went okay, pointer containing error code
+ * otherwise
+ */
+struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper)
+{
+	struct device *dev = fb_helper->dev->dev;
+	struct fb_info *info;
+	int ret;
+	info = framebuffer_alloc(0, dev);
+	if (!info)
+		return ERR_PTR(-ENOMEM);
+	fb_helper->fbdev = info;
+	return info;
 EXPORT_SYMBOL(drm_fb_helper_init);
 EXPORT_SYMBOL(drm_fb_helper_alloc_fbi);
 static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 		     u16 blue, u16 regno, struct fb_info *info)
  */
 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
 	struct drm_fb_helper *fb_helper = info->par;
 	struct drm_device *dev = fb_helper->dev;
-	struct drm_crtc_helper_funcs *crtc_funcs;
+	const struct drm_crtc_helper_funcs *crtc_funcs;
 	u16 *red, *green, *blue, *transp;
 	struct drm_crtc *crtc;
 	int i, j, rc = 0;
 	int start;
+	if (oops_in_progress)
+		return -EBUSY;
 	drm_modeset_lock_all(dev);
 	if (!drm_fb_helper_is_bound(fb_helper)) {
 		drm_modeset_unlock_all(dev);
 		return -EBUSY;
 int drm_fb_helper_set_par(struct fb_info *info)
+{
 	struct drm_fb_helper *fb_helper = info->par;
 	struct fb_var_screeninfo *var = &info->var;
+	if (oops_in_progress)
+		return -EBUSY;
 	if (var->pixclock != 0) {
 		DRM_ERROR("PIXEL CLOCK SET\n");
 		return -EINVAL;
 	return 0;
+}
+EXPORT_SYMBOL(drm_fb_helper_set_par);
+static int pan_display_atomic(struct fb_var_screeninfo *var,
+			      struct fb_info *info)
+{
+	struct drm_fb_helper *fb_helper = info->par;
+	struct drm_device *dev = fb_helper->dev;
+	struct drm_atomic_state *state;
+	struct drm_plane *plane;
+	int i, ret;
+	unsigned plane_mask;
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+	state->acquire_ctx = dev->mode_config.acquire_ctx;
+retry:
+	plane_mask = 0;
+	for(i = 0; i < fb_helper->crtc_count; i++) {
+		struct drm_mode_set *mode_set;
+		mode_set = &fb_helper->crtc_info[i].mode_set;
+		mode_set->x = var->xoffset;
+		mode_set->y = var->yoffset;
+		ret = __drm_atomic_helper_set_config(mode_set, state);
+		if (ret != 0)
+			goto fail;
+		plane = mode_set->crtc->primary;
+		plane_mask |= drm_plane_index(plane);
+		plane->old_fb = plane->fb;
+	}
+	ret = drm_atomic_commit(state);
+	if (ret != 0)
+		goto fail;
+	info->var.xoffset = var->xoffset;
+	info->var.yoffset = var->yoffset;
+fail:
+	drm_atomic_clean_old_fb(dev, plane_mask, ret);
+	if (ret == -EDEADLK)
+		goto backoff;
+	if (ret != 0)
+		drm_atomic_state_free(state);
+	return ret;
+backoff:
+	drm_atomic_state_clear(state);
+	drm_atomic_legacy_backoff(state);
+	goto retry;
 EXPORT_SYMBOL(drm_fb_helper_set_par);
 /**
  * drm_fb_helper_pan_display - implementation for ->fb_pan_display
  * @var: updated screen information
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_mode_set *modeset;
 	int ret = 0;
 	int i;
+	if (oops_in_progress)
+		return -EBUSY;
 	drm_modeset_lock_all(dev);
 	if (!drm_fb_helper_is_bound(fb_helper)) {
 		drm_modeset_unlock_all(dev);
 		return -EBUSY;
+	}
+	if (fb_helper->atomic) {
+		ret = pan_display_atomic(var, info);
+		goto unlock;
+	}
-		for (i = 0; i < fb_helper->crtc_count; i++) {
+	for (i = 0; i < fb_helper->crtc_count; i++) {
 		modeset = &fb_helper->crtc_info[i].mode_set;
 				info->var.xoffset = var->xoffset;
 				info->var.yoffset = var->yoffset;
+			}
+		}
+	}
+unlock:
 	drm_modeset_unlock_all(dev);
 	return ret;
+}
 EXPORT_SYMBOL(drm_fb_helper_pan_display);
+	}
 	crtc_count = 0;
 	for (i = 0; i < fb_helper->crtc_count; i++) {
+		struct drm_display_mode *desired_mode;
-		struct drm_display_mode *desired_mode;
+		struct drm_mode_set *mode_set;
+		int x, y, j;
+		/* in case of tile group, are we the last tile vert or horiz?
+		 * If no tile group you are always the last one both vertically
+		 * and horizontally
+		 */
+		bool lastv = true, lasth = true;
 		int x, y;
+		desired_mode = fb_helper->crtc_info[i].desired_mode;
+		mode_set = &fb_helper->crtc_info[i].mode_set;
+		if (!desired_mode)
+			continue;
+		crtc_count++;
 		desired_mode = fb_helper->crtc_info[i].desired_mode;
 		x = fb_helper->crtc_info[i].x;
-		y = fb_helper->crtc_info[i].y;
+		y = fb_helper->crtc_info[i].y;
 		if (desired_mode) {
-			if (gamma_size == 0)
+		if (gamma_size == 0)
+			gamma_size = fb_helper->crtc_info[i].mode_set.crtc->gamma_size;
-				gamma_size = fb_helper->crtc_info[i].mode_set.crtc->gamma_size;
-			if (desired_mode->hdisplay + x < sizes.fb_width)
+		sizes.surface_width  = max_t(u32, desired_mode->hdisplay + x, sizes.surface_width);
+		sizes.surface_height = max_t(u32, desired_mode->vdisplay + y, sizes.surface_height);
-				sizes.fb_width = desired_mode->hdisplay + x;
-			if (desired_mode->vdisplay + y < sizes.fb_height)
+		for (j = 0; j < mode_set->num_connectors; j++) {
-				sizes.fb_height = desired_mode->vdisplay + y;
+			struct drm_connector *connector = mode_set->connectors[j];
-			if (desired_mode->hdisplay + x > sizes.surface_width)
+			if (connector->has_tile) {
-				sizes.surface_width = desired_mode->hdisplay + x;
+				lasth = (connector->tile_h_loc == (connector->num_h_tile - 1));
-			if (desired_mode->vdisplay + y > sizes.surface_height)
+				lastv = (connector->tile_v_loc == (connector->num_v_tile - 1));
-				sizes.surface_height = desired_mode->vdisplay + y;
+				/* cloning to multiple tiles is just crazy-talk, so: */
+				break;
 			crtc_count++;
+		}
+		if (lasth)
+			sizes.fb_width  = min_t(u32, desired_mode->hdisplay + x, sizes.fb_width);
+		if (lastv)
 			sizes.fb_height = min_t(u32, desired_mode->vdisplay + y, sizes.fb_height);
+	}
 	if (crtc_count == 0 || sizes.fb_width == -1 || sizes.fb_height == -1) {
 		if (fb_helper->crtc_info[i].mode_set.num_connectors)
-		fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
+			fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
 	info->var.pixclock = 0;
 		info->var.pixclock = 0;
+	dev_info(fb_helper->dev->dev, "fb%d: %s frame buffer device\n",
-	dev_info(fb_helper->dev->dev, "fb%d: %s frame buffer device\n",
+			info->node, info->fix.id);
 			info->node, info->fix.id);
 struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,
 						      int width, int height)
+{
 	struct drm_cmdline_mode *cmdline_mode;
-	struct drm_display_mode *mode = NULL;
+	struct drm_display_mode *mode;
 	bool prefer_non_interlace;
+    return NULL;
-	return NULL;
+#if 0
+	cmdline_mode = &fb_helper_conn->connector->cmdline_mode;
 	if (cmdline_mode->specified == false)
-		return mode;
+        return NULL;
 	/* attempt to find a matching mode in the list of modes
 create_mode:
 	mode = drm_mode_create_from_cmdline_mode(fb_helper_conn->connector->dev,
 						 cmdline_mode);
 	list_add(&mode->head, &fb_helper_conn->connector->modes);
 	return mode;
+#endif
+}
 EXPORT_SYMBOL(drm_pick_cmdline_mode);
 static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
 			  int n, int width, int height)
+{
 	int c, o;
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_connector *connector;
-	struct drm_connector_helper_funcs *connector_funcs;
+	const struct drm_connector_helper_funcs *connector_funcs;
 	struct drm_encoder *encoder;
 	int my_score, best_score, score;
 	struct drm_fb_helper_crtc **crtcs, *crtc;
 	struct drm_fb_helper_connector *fb_helper_conn;
  * values for the fbdev info structure.
+ *
  * RETURNS:
  * Zero if everything went ok, nonzero otherwise.
  */
-bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel)
+int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel)
+{
 	struct drm_device *dev = fb_helper->dev;
 	int count = 0;
+	if (!drm_fbdev_emulation)
+		return 0;
 	mutex_lock(&dev->mode_config.mutex);
 	count = drm_fb_helper_probe_connector_modes(fb_helper,
 						    dev->mode_config.max_width,
 						    dev->mode_config.max_height);
 int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
+{
 	struct drm_device *dev = fb_helper->dev;
 	u32 max_width, max_height;
+	if (!drm_fbdev_emulation)
+		return 0;
 	mutex_lock(&fb_helper->dev->mode_config.mutex);
 	if (!fb_helper->fb || !drm_fb_helper_is_bound(fb_helper)) {
 		fb_helper->delayed_hotplug = true;
 		mutex_unlock(&fb_helper->dev->mode_config.mutex);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_fb_helper.c – Rev 5271 → 6084