WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_fbdev.c

 #include
 #include
 #include
 #include
 #include
-//#include
+#include
 //#include
 #include
 #include
 #include
 //#include
 #include
 #include "intel_drv.h"
 #include
 #include "i915_drv.h"
 struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
+{
 #define BYTES_PER_LONG (BITS_PER_LONG/8)
 #define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG))
 	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.
-		 */
+	if (ret == 0) {
+		mutex_lock(&fb_helper->dev->struct_mutex);
+		intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
+		mutex_unlock(&fb_helper->dev->struct_mutex);
+	}
+	return ret;
+}
+static int intel_fbdev_blank(int blank, 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_blank(blank, info);
+	if (ret == 0) {
+		mutex_lock(&fb_helper->dev->struct_mutex);
+		intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
+		mutex_unlock(&fb_helper->dev->struct_mutex);
-		mutex_lock(&fb_helper->dev->struct_mutex);
+	}
+	return ret;
+}
+static int intel_fbdev_pan_display(struct fb_var_screeninfo *var,
+				   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_pan_display(var, info);
+	if (ret == 0) {
-		ret = i915_gem_object_set_to_gtt_domain(ifbdev->fb->obj,
+		mutex_lock(&fb_helper->dev->struct_mutex);
-							true);
+		intel_fb_obj_invalidate(ifbdev->fb->obj, ORIGIN_GTT);
 		mutex_unlock(&fb_helper->dev->struct_mutex);
+	}
 	.fb_check_var = drm_fb_helper_check_var,
 	.fb_set_par = intel_fbdev_set_par,
 //   .fb_fillrect = cfb_fillrect,
 //   .fb_copyarea = cfb_copyarea,
 //   .fb_imageblit = cfb_imageblit,
-//   .fb_pan_display = drm_fb_helper_pan_display,
+	.fb_pan_display = intel_fbdev_pan_display,
-	.fb_blank = drm_fb_helper_blank,
+	.fb_blank = intel_fbdev_blank,
 //   .fb_setcmap = drm_fb_helper_setcmap,
 //   .fb_debug_enter = drm_fb_helper_debug_enter,
 //   .fb_debug_leave = drm_fb_helper_debug_leave,
 };
+{
 	struct intel_fbdev *ifbdev =
 		container_of(helper, struct intel_fbdev, helper);
 	struct drm_framebuffer *fb;
 	struct drm_device *dev = helper->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct drm_mode_fb_cmd2 mode_cmd = {};
-	struct drm_i915_gem_object *obj;
+	struct drm_i915_gem_object *obj = NULL;
 	int size, ret;
 	/* we don't do packed 24bpp */
 	if (sizes->surface_bpp == 24)
 				    DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
 	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
 							  sizes->surface_depth);
 	size = mode_cmd.pitches[0] * mode_cmd.height;
-	size = ALIGN(size, PAGE_SIZE);
+	size = PAGE_ALIGN(size);
 	obj = main_fb_obj;
-    obj->stride = mode_cmd.pitches[0];
+	obj->map_and_fenceable=true;
 	if (!obj) {
 		DRM_ERROR("failed to allocate framebuffer\n");
 		ret = -ENOMEM;
 		goto out;
 		ret = PTR_ERR(fb);
 		goto out_unref;
+	}
 	/* Flush everything out, we'll be doing GTT only from now on */
-	ret = intel_pin_and_fence_fb_obj(NULL, fb, NULL);
+	ret = intel_pin_and_fence_fb_obj(NULL, fb, NULL, NULL, NULL);
 	if (ret) {
 		DRM_ERROR("failed to pin obj: %d\n", ret);
 		goto out_fb;
+	}
 	obj = intel_fb->obj;
 	size = obj->base.size;
-	info = framebuffer_alloc(0, &dev->pdev->dev);
+	info = drm_fb_helper_alloc_fbi(helper);
-	if (!info) {
+	if (IS_ERR(info)) {
-		ret = -ENOMEM;
+		ret = PTR_ERR(info);
 		goto out_unpin;
+	}
+	info->par = helper;
 	fb = &ifbdev->fb->base;
-	info->par = helper;
-	fb = &ifbdev->fb->base;
+    if(main_framebuffer == NULL)
         main_framebuffer = fb;
 	ifbdev->helper.fb = fb;
-	ifbdev->helper.fbdev = info;
-    strcpy(info->fix.id, "inteldrmfb");
-    info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
-    info->fbops = &intelfb_ops;
+	ifbdev->helper.fb = fb;
-    /* setup aperture base/size for vesafb takeover */
+	strcpy(info->fix.id, "inteldrmfb");
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
 	drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
 	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
-	DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08lx, bo %p\n",
+	DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08llx, bo %p\n",
 		      fb->width, fb->height,
 		      i915_gem_obj_ggtt_offset(obj), obj);
+	mutex_unlock(&dev->struct_mutex);
 	return 0;
 	mutex_unlock(&dev->struct_mutex);
-	return 0;
+out_destroy_fbi:
 	drm_fb_helper_release_fbi(helper);
 out_unpin:
 		if (!modes[i]) {
 			/*
 			 * IMPORTANT: We want to use the adjusted mode (i.e.
 			 * after the panel fitter upscaling) as the initial
 			 * config, not the input mode, which is what crtc->mode
-			 * usually contains. But since our current fastboot
+			 * usually contains. But since our current
 			 * code puts a mode derived from the post-pfit timings
-			 * into crtc->mode this works out correctly. We don't
+			 * into crtc->mode this works out correctly.
-			 * use hwmode anywhere right now, so use it for this
-			 * since the fb helper layer wants a pointer to
-			 * something we own.
 			 */
 			DRM_DEBUG_KMS("looking for current mode on connector %s\n",
 				      connector->name);
-			intel_mode_from_pipe_config(&encoder->crtc->hwmode,
-						    &to_intel_crtc(encoder->crtc)->config);
-			modes[i] = &encoder->crtc->hwmode;
+			modes[i] = &encoder->crtc->mode;
+		}
 		crtcs[i] = new_crtc;
 		DRM_DEBUG_KMS("connector %s on pipe %c [CRTC:%d]: %dx%d%s\n",
 				 struct intel_fbdev *ifbdev)
+{
 	struct intel_framebuffer *fb = NULL;
 	struct drm_crtc *crtc;
 	struct intel_crtc *intel_crtc;
-	struct intel_plane_config *plane_config = NULL;
 	unsigned int max_size = 0;
-	if (!i915.fastboot)
-		return false;
 	/* Find the largest fb */
+	for_each_crtc(dev, crtc) {
+		struct drm_i915_gem_object *obj =
-	for_each_crtc(dev, crtc) {
+			intel_fb_obj(crtc->primary->state->fb);
 		intel_crtc = to_intel_crtc(crtc);
-		if (!intel_crtc->active || !crtc->primary->fb) {
+		if (!crtc->state->active || !obj) {
 			DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
 				      pipe_name(intel_crtc->pipe));
 			continue;
+		}
-		if (intel_crtc->plane_config.size > max_size) {
-			DRM_DEBUG_KMS("found possible fb from plane %c\n",
+		if (obj->base.size > max_size) {
-				      pipe_name(intel_crtc->pipe));
+			DRM_DEBUG_KMS("found possible fb from plane %c\n",
-			plane_config = &intel_crtc->plane_config;
+				      pipe_name(intel_crtc->pipe));
-			fb = to_intel_framebuffer(crtc->primary->fb);
+			fb = to_intel_framebuffer(crtc->primary->state->fb);
-			max_size = plane_config->size;
+			max_size = obj->base.size;
+		}
 	for_each_crtc(dev, crtc) {
 		unsigned int cur_size;
 		intel_crtc = to_intel_crtc(crtc);
-		if (!intel_crtc->active) {
+		if (!crtc->state->active) {
 			DRM_DEBUG_KMS("pipe %c not active, skipping\n",
 				      pipe_name(intel_crtc->pipe));
 		/*
 		 * See if the plane fb we found above will fit on this
 		 * pipe.  Note we need to use the selected fb's pitch and bpp
 		 * rather than the current pipe's, since they differ.
 		 */
-		cur_size = intel_crtc->config.adjusted_mode.crtc_hdisplay;
+		cur_size = intel_crtc->config->base.adjusted_mode.crtc_hdisplay;
 		cur_size = cur_size * fb->base.bits_per_pixel / 8;
 		if (fb->base.pitches[0] < cur_size) {
 			DRM_DEBUG_KMS("fb not wide enough for plane %c (%d vs %d)\n",
 				      pipe_name(intel_crtc->pipe),
 				      cur_size, fb->base.pitches[0]);
-			plane_config = NULL;
 			fb = NULL;
 			break;
+		}
-		cur_size = intel_crtc->config.adjusted_mode.crtc_vdisplay;
+		cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
+		cur_size = intel_fb_align_height(dev, cur_size,
+						 fb->base.pixel_format,
-		cur_size = ALIGN(cur_size, plane_config->tiled ? (IS_GEN2(dev) ? 16 : 8) : 1);
+						 fb->base.modifier[0]);
 		cur_size *= fb->base.pitches[0];
 		DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
 			      pipe_name(intel_crtc->pipe),
-			      intel_crtc->config.adjusted_mode.crtc_hdisplay,
+			      intel_crtc->config->base.adjusted_mode.crtc_hdisplay,
-			      intel_crtc->config.adjusted_mode.crtc_vdisplay,
+			      intel_crtc->config->base.adjusted_mode.crtc_vdisplay,
 			      fb->base.bits_per_pixel,
 			      cur_size);
 		if (cur_size > max_size) {
 			DRM_DEBUG_KMS("fb not big enough for plane %c (%d vs %d)\n",
-				      pipe_name(intel_crtc->pipe),
-				      cur_size, max_size);
+				      pipe_name(intel_crtc->pipe),
-			plane_config = NULL;
+				      cur_size, max_size);
 			fb = NULL;
 			break;
 	/* Final pass to check if any active pipes don't have fbs */
 	for_each_crtc(dev, crtc) {
 		intel_crtc = to_intel_crtc(crtc);
-		if (!intel_crtc->active)
+		if (!crtc->state->active)
 			continue;
 	if (ret) {
 		kfree(ifbdev);
 		return ret;
+	}
+	ifbdev->helper.atomic = true;
 	dev_priv->fbdev = ifbdev;
 	drm_fb_helper_single_add_all_connectors(&ifbdev->helper);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_fbdev.c – Rev 5367 → 6084