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

 				      intel_crtc->pipe,
 				      work->event);
 	drm_crtc_vblank_put(&intel_crtc->base);
-//	wake_up_all(&dev_priv->pending_flip_queue);
+	wake_up_all(&dev_priv->pending_flip_queue);
-//	queue_work(dev_priv->wq, &work->work);
+	queue_work(dev_priv->wq, &work->work);
-//	trace_i915_flip_complete(intel_crtc->plane,
+	trace_i915_flip_complete(intel_crtc->plane,
-//				 work->pending_flip_obj);
+				 work->pending_flip_obj);
+}
 #if 0
 void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
 		mutex_lock(&dev->struct_mutex);
 		intel_finish_fb(crtc->primary->fb);
 		mutex_unlock(&dev->struct_mutex);
+	}
+}
-#endif
 /* Program iCLKIP clock to the desired frequency */
 static void lpt_program_iclkip(struct drm_crtc *crtc)
+{
 		i915_gem_track_fb(intel_fb_obj(plane->base.fb), NULL,
 				  plane->frontbuffer_bit);
 		mutex_unlock(&dev->struct_mutex);
+	}
+	if (atomic->wait_for_flips)
+		intel_crtc_wait_for_pending_flips(&crtc->base);
 	if (atomic->disable_fbc)
 		intel_fbc_disable_crtc(crtc);
 	/*
 	 * FIXME: Once we grow proper nuclear flip support out of this we need
 	 * to compute the mask of flip planes precisely. For the time being
 	 * consider this a flip to a NULL plane.
 	 */
-//	intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe));
+	intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe));
+}
 static void ironlake_crtc_enable(struct drm_crtc *crtc)
+{
 	if (!intel_crtc->active)
 		return;
 	if (to_intel_plane_state(crtc->primary->state)->visible) {
-	if (to_intel_plane_state(crtc->primary->state)->visible) {
+		intel_crtc_wait_for_pending_flips(crtc);
 		intel_pre_disable_primary(crtc);
 	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,
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_unpin_work *work;
-	WARN_ON(!in_interrupt());
 	if (crtc == NULL)
 		return;
 	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);
+		}
+	}
 	intel_crtc->unpin_work = work;
 	spin_unlock_irq(&dev->event_lock);
-	if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
+//   if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
-		flush_workqueue(dev_priv->wq);
+//       flush_workqueue(dev_priv->wq);
 	/* Reference the objects for the scheduled work. */
 		DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID reported max of %d\n",
 			      bpp, connector->base.display_info.bpc*3);
 		pipe_config->pipe_bpp = connector->base.display_info.bpc*3;
+	}
-	/* Clamp bpp to 8 on screens without EDID 1.4 */
+	/* Clamp bpp to default limit on screens without EDID 1.4 */
+	if (connector->base.display_info.bpc == 0) {
+		int type = connector->base.connector_type;
+		int clamp_bpp = 24;
+		/* Fall back to 18 bpp when DP sink capability is unknown. */
+		if (type == DRM_MODE_CONNECTOR_DisplayPort ||
+		    type == DRM_MODE_CONNECTOR_eDP)
+			clamp_bpp = 18;
-	if (connector->base.display_info.bpc == 0 && bpp > 24) {
+		if (bpp > clamp_bpp) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n",
+			DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of %d\n",
-			      bpp);
+				      bpp, clamp_bpp);
+			pipe_config->pipe_bpp = clamp_bpp;
 		pipe_config->pipe_bpp = 24;
+	}
+}
 static const struct drm_crtc_funcs intel_crtc_funcs = {
 	.gamma_set = intel_crtc_gamma_set,
 	.set_config = drm_atomic_helper_set_config,
 	.destroy = intel_crtc_destroy,
-//	.page_flip = intel_crtc_page_flip,
+	.page_flip = intel_crtc_page_flip,
 	.atomic_duplicate_state = intel_crtc_duplicate_state,
 	.atomic_destroy_state = intel_crtc_destroy_state,
 };
 	struct drm_framebuffer *fb = state->base.fb;
 	int min_scale = DRM_PLANE_HELPER_NO_SCALING;
 	int max_scale = DRM_PLANE_HELPER_NO_SCALING;
 	bool can_position = false;
 	if (INTEL_INFO(plane->dev)->gen >= 9) {
-	/* use scaler when colorkey is not required */
-	if (INTEL_INFO(plane->dev)->gen >= 9 &&
+	/* use scaler when colorkey is not required */
-	    state->ckey.flags == I915_SET_COLORKEY_NONE) {
+		if (state->ckey.flags == I915_SET_COLORKEY_NONE) {
 		min_scale = 1;
+		max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
 		max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
 		can_position = true;
+	}
 			broxton_modeset_commit_cdclk;
 		dev_priv->display.modeset_calc_cdclk =
 			broxton_modeset_calc_cdclk;
+	}
+	switch (INTEL_INFO(dev)->gen) {
+	case 2:
+		dev_priv->display.queue_flip = intel_gen2_queue_flip;
+		break;
+	case 3:
+		dev_priv->display.queue_flip = intel_gen3_queue_flip;
+		break;
+	case 4:
+	case 5:
+		dev_priv->display.queue_flip = intel_gen4_queue_flip;
+		break;
+	case 6:
+		dev_priv->display.queue_flip = intel_gen6_queue_flip;
+		break;
+	case 7:
+	case 8: /* FIXME(BDW): Check that the gen8 RCS flip works. */
+		dev_priv->display.queue_flip = intel_gen7_queue_flip;
+		break;
+	case 9:
+		/* Drop through - unsupported since execlist only. */
 	default:
 		/* Default just returns -ENODEV to indicate unsupported */
 		dev_priv->display.queue_flip = intel_default_queue_flip;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_display.c – Rev 6296 → 6320