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

 	dev_priv->display.update_primary_plane(crtc, fb, x, y);
 	return 0;
-}
+}
 #if 0
 static void intel_complete_page_flips(struct drm_device *dev)
+{
 		dev_priv->display.hpd_irq_setup(dev);
 	spin_unlock_irq(&dev_priv->irq_lock);
 	intel_display_resume(dev);
-	intel_hpd_init(dev_priv);
+//	intel_hpd_init(dev_priv);
 	pending = to_intel_crtc(crtc)->unpin_work != NULL;
 	spin_unlock_irq(&dev->event_lock);
 	return pending;
-}
 #endif
 static void intel_update_pipe_config(struct intel_crtc *crtc,
 				     struct intel_crtc_state *old_crtc_state)
+	}
 	return false;
+}
+static void page_flip_completed(struct intel_crtc *intel_crtc)
+{
+	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
+	struct intel_unpin_work *work = intel_crtc->unpin_work;
+	/* ensure that the unpin work is consistent wrt ->pending. */
+	smp_rmb();
+	intel_crtc->unpin_work = NULL;
+	if (work->event)
+		drm_send_vblank_event(intel_crtc->base.dev,
+				      intel_crtc->pipe,
+				      work->event);
+	drm_crtc_vblank_put(&intel_crtc->base);
+//	wake_up_all(&dev_priv->pending_flip_queue);
+//	queue_work(dev_priv->wq, &work->work);
+//	trace_i915_flip_complete(intel_crtc->plane,
 //				 work->pending_flip_obj);
+}
 #if 0
 void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
+{
 	val = I915_READ(PIPESRC(pipe));
 	fb->width = ((val >> 16) & 0xfff) + 1;
 	fb->height = ((val >> 0) & 0xfff) + 1;
 	val = I915_READ(DSPSTRIDE(pipe));
-//   fb->pitches[0] = val & 0xffffffc0;
-	fb->pitches[0] = 2560*4;
+	fb->pitches[0] = val & 0xffffffc0;
 	aligned_height = intel_fb_align_height(dev, fb->height,
 					       fb->pixel_format,
-					       fb->modifier[0]);
 					       fb->modifier[0]);
 //   plane_config->size = fb->pitches[0] * aligned_height;
-    plane_config->size = i915.fbsize*1024*1024;
+	plane_config->size = fb->pitches[0] * aligned_height;
 	fb->width = ((val >> 0) & 0x1fff) + 1;
 	val = I915_READ(PLANE_STRIDE(pipe, 0));
 	stride_mult = intel_fb_stride_alignment(dev, fb->modifier[0],
 						fb->pixel_format);
-//   fb->pitches[0] = (val & 0x3ff) * stride_mult;
-    fb->pitches[0] = 2560*4;
+	fb->pitches[0] = (val & 0x3ff) * stride_mult;
 	aligned_height = intel_fb_align_height(dev, fb->height,
 					       fb->pixel_format,
-					       fb->modifier[0]);
 					       fb->modifier[0]);
 //   plane_config->size = fb->pitches[0] * aligned_height;
-    plane_config->size = i915.fbsize*1024*1024;
+	plane_config->size = fb->pitches[0] * aligned_height;
 	val = I915_READ(PIPESRC(pipe));
 	fb->width = ((val >> 16) & 0xfff) + 1;
 	fb->height = ((val >> 0) & 0xfff) + 1;
 	val = I915_READ(DSPSTRIDE(pipe));
-//   fb->pitches[0] = val & 0xffffffc0;
-    fb->pitches[0] = 2560*4;
+	fb->pitches[0] = val & 0xffffffc0;
 	aligned_height = intel_fb_align_height(dev, fb->height,
 					       fb->pixel_format,
-					       fb->modifier[0]);
 					       fb->modifier[0]);
 //   plane_config->size = fb->pitches[0] * aligned_height;
-    plane_config->size = i915.fbsize*1024*1024;
+	plane_config->size = fb->pitches[0] * aligned_height;
 	drm_crtc_cleanup(crtc);
 	kfree(intel_crtc);
-}
+}
 #if 0
 static void intel_unpin_work_fn(struct work_struct *__work)
+{
 	struct intel_unpin_work *work =
 	smp_wmb();
 	atomic_set(&work->pending, INTEL_FLIP_PENDING);
 	/* and that it is marked active as soon as the irq could fire. */
 	smp_wmb();
+}
+#if 0
 static int intel_gen2_queue_flip(struct drm_device *dev,
 				 struct drm_crtc *crtc,
 				 struct drm_framebuffer *fb,
 				 struct drm_i915_gem_object *obj,
 				 struct drm_i915_gem_request *req,
 	if (work != NULL &&
 	    drm_vblank_count(dev, pipe) - work->flip_queued_vblank > 1)
 		intel_queue_rps_boost_for_request(dev, work->flip_queued_req);
 	spin_unlock(&dev->event_lock);
+}
+#endif
 static int intel_crtc_page_flip(struct drm_crtc *crtc,
 				struct drm_framebuffer *fb,
 				struct drm_pending_vblank_event *event,
 				uint32_t page_flip_flags)
+{
 		return -ENOMEM;
 	work->event = event;
 	work->crtc = crtc;
 	work->old_fb = old_fb;
-	INIT_WORK(&work->work, intel_unpin_work_fn);
+//	INIT_WORK(&work->work, intel_unpin_work_fn);
 	ret = drm_crtc_vblank_get(crtc);
 			spin_unlock_irq(&dev->event_lock);
+		}
+	}
 	return ret;
+}
-#endif
 /**
 	ret = drm_framebuffer_init(dev, &intel_fb->base, &intel_fb_funcs);
 	if (ret) {
 		DRM_ERROR("framebuffer init failed %d\n", ret);
 		return ret;
+	}
+	kolibri_framebuffer_init(intel_fb);
 	return 0;
+}
 		/*
 		 * If the fb is shared between multiple heads, we'll
 		 * just get the first one.
 		 */
 		intel_find_initial_plane_obj(crtc, &plane_config);
-		if(!main_fb_obj)
-		{
-			struct drm_framebuffer *fb;
-			fb = crtc->base.primary->fb;
-			main_fb_obj = intel_fb_obj(fb);
-			main_fb_obj->map_and_fenceable=true;
-			DRM_DEBUG_KMS("main_fb_obj %p gtt_offset 0x%08lx\n", main_fb_obj, i915_gem_obj_ggtt_offset(main_fb_obj));
-		}
+	}
+}
 static void intel_enable_pipe_a(struct drm_device *dev)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_display.c @ 6660 – Rev 6088 → 6283