Merge tag 'drm-intel-fixes-2017-06-20' of... (09da4baa) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_gem.c

+42 −21

Original line number	Diff line number	Diff line
		@@ -2285,8 +2285,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
		struct page *page;
		unsigned long last_pfn = 0; /* suppress gcc warning */
		unsigned int max_segment;
		gfp_t noreclaim;
		int ret;
		gfp_t gfp;

		/* Assert that the object is not currently in any GPU domain. As it
		* wasn't in the GTT, there shouldn't be any way it could have been in
		@@ -2315,22 +2315,31 @@ rebuild_st:
		* Fail silently without starting the shrinker
		*/
		mapping = obj->base.filp->f_mapping;
		gfp = mapping_gfp_constraint(mapping, ~(__GFP_IO \| __GFP_RECLAIM));
		gfp \|= __GFP_NORETRY \| __GFP_NOWARN;
		noreclaim = mapping_gfp_constraint(mapping,
		~(__GFP_IO \| __GFP_RECLAIM));
		noreclaim \|= __GFP_NORETRY \| __GFP_NOWARN;

		sg = st->sgl;
		st->nents = 0;
		for (i = 0; i < page_count; i++) {
		const unsigned int shrink[] = {
		I915_SHRINK_BOUND \| I915_SHRINK_UNBOUND \| I915_SHRINK_PURGEABLE,
		0,
		}, *s = shrink;
		gfp_t gfp = noreclaim;

		do {
		page = shmem_read_mapping_page_gfp(mapping, i, gfp);
		if (unlikely(IS_ERR(page))) {
		i915_gem_shrink(dev_priv,
		page_count,
		I915_SHRINK_BOUND \|
		I915_SHRINK_UNBOUND \|
		I915_SHRINK_PURGEABLE);
		page = shmem_read_mapping_page_gfp(mapping, i, gfp);
		if (likely(!IS_ERR(page)))
		break;

		if (!*s) {
		ret = PTR_ERR(page);
		goto err_sg;
		}
		if (unlikely(IS_ERR(page))) {
		gfp_t reclaim;

		i915_gem_shrink(dev_priv, 2 * page_count, *s++);
		cond_resched();

		/* We've tried hard to allocate the memory by reaping
		* our own buffer, now let the real VM do its job and
		@@ -2340,15 +2349,26 @@ rebuild_st:
		* defer the oom here by reporting the ENOMEM back
		* to userspace.
		*/
		reclaim = mapping_gfp_mask(mapping);
		reclaim \|= __GFP_NORETRY; /* reclaim, but no oom */
		if (!*s) {
		/* reclaim and warn, but no oom */
		gfp = mapping_gfp_mask(mapping);

		page = shmem_read_mapping_page_gfp(mapping, i, reclaim);
		if (IS_ERR(page)) {
		ret = PTR_ERR(page);
		goto err_sg;
		}
		/* Our bo are always dirty and so we require
		* kswapd to reclaim our pages (direct reclaim
		* does not effectively begin pageout of our
		* buffers on its own). However, direct reclaim
		* only waits for kswapd when under allocation
		* congestion. So as a result __GFP_RECLAIM is
		* unreliable and fails to actually reclaim our
		* dirty pages -- unless you try over and over
		* again with !__GFP_NORETRY. However, we still
		* want to fail this allocation rather than
		* trigger the out-of-memory killer and for
		* this we want the future __GFP_MAYFAIL.
		*/
		}
		} while (1);

		if (!i \|\|
		sg->length >= max_segment \|\|
		page_to_pfn(page) != last_pfn + 1) {
		@@ -4222,6 +4242,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size)

		mapping = obj->base.filp->f_mapping;
		mapping_set_gfp_mask(mapping, mask);
		GEM_BUG_ON(!(mapping_gfp_mask(mapping) & __GFP_RECLAIM));

		i915_gem_object_init(obj, &i915_gem_object_ops);

drivers/gpu/drm/i915/i915_gem_request.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -623,7 +623,7 @@ i915_gem_request_alloc(struct intel_engine_cs *engine,
		* GPU processing the request, we never over-estimate the
		* position of the head.
		*/
		req->head = req->ring->tail;
		req->head = req->ring->emit;

		/* Check that we didn't interrupt ourselves with a new request */
		GEM_BUG_ON(req->timeline->seqno != req->fence.seqno);

drivers/gpu/drm/i915/i915_guc_submission.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -480,9 +480,7 @@ static void guc_wq_item_append(struct i915_guc_client *client,
		GEM_BUG_ON(freespace < wqi_size);

		/* The GuC firmware wants the tail index in QWords, not bytes */
		tail = rq->tail;
		assert_ring_tail_valid(rq->ring, rq->tail);
		tail >>= 3;
		tail = intel_ring_set_tail(rq->ring, rq->tail) >> 3;
		GEM_BUG_ON(tail > WQ_RING_TAIL_MAX);

		/* For now workqueue item is 4 DWs; workqueue buffer is 2 pages. So we

drivers/gpu/drm/i915/intel_display.c

+17 −13

Original line number	Diff line number	Diff line
		@@ -120,7 +120,8 @@ static void intel_crtc_init_scalers(struct intel_crtc *crtc,
		static void skylake_pfit_enable(struct intel_crtc *crtc);
		static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force);
		static void ironlake_pfit_enable(struct intel_crtc *crtc);
		static void intel_modeset_setup_hw_state(struct drm_device *dev);
		static void intel_modeset_setup_hw_state(struct drm_device *dev,
		struct drm_modeset_acquire_ctx *ctx);
		static void intel_pre_disable_primary_noatomic(struct drm_crtc *crtc);

		struct intel_limit {
		@@ -3449,7 +3450,7 @@ __intel_display_resume(struct drm_device *dev,
		struct drm_crtc *crtc;
		int i, ret;

		intel_modeset_setup_hw_state(dev);
		intel_modeset_setup_hw_state(dev, ctx);
		i915_redisable_vga(to_i915(dev));

		if (!state)
		@@ -5825,7 +5826,8 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,
		intel_update_watermarks(intel_crtc);
		}

		static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
		static void intel_crtc_disable_noatomic(struct drm_crtc *crtc,
		struct drm_modeset_acquire_ctx *ctx)
		{
		struct intel_encoder *encoder;
		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
		@@ -5855,7 +5857,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
		return;
		}

		state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
		state->acquire_ctx = ctx;

		/* Everything's already locked, -EDEADLK can't happen. */
		crtc_state = intel_atomic_get_crtc_state(state, intel_crtc);
		@@ -15030,7 +15032,7 @@ int intel_modeset_init(struct drm_device *dev)
		intel_setup_outputs(dev_priv);

		drm_modeset_lock_all(dev);
		intel_modeset_setup_hw_state(dev);
		intel_modeset_setup_hw_state(dev, dev->mode_config.acquire_ctx);
		drm_modeset_unlock_all(dev);

		for_each_intel_crtc(dev, crtc) {
		@@ -15067,13 +15069,13 @@ int intel_modeset_init(struct drm_device *dev)
		return 0;
		}

		static void intel_enable_pipe_a(struct drm_device *dev)
		static void intel_enable_pipe_a(struct drm_device *dev,
		struct drm_modeset_acquire_ctx *ctx)
		{
		struct intel_connector *connector;
		struct drm_connector_list_iter conn_iter;
		struct drm_connector *crt = NULL;
		struct intel_load_detect_pipe load_detect_temp;
		struct drm_modeset_acquire_ctx *ctx = dev->mode_config.acquire_ctx;
		int ret;

		/* We can't just switch on the pipe A, we need to set things up with a
		@@ -15145,7 +15147,8 @@ static bool has_pch_trancoder(struct drm_i915_private *dev_priv,
		(HAS_PCH_LPT_H(dev_priv) && pch_transcoder == TRANSCODER_A);
		}

		static void intel_sanitize_crtc(struct intel_crtc *crtc)
		static void intel_sanitize_crtc(struct intel_crtc *crtc,
		struct drm_modeset_acquire_ctx *ctx)
		{
		struct drm_device *dev = crtc->base.dev;
		struct drm_i915_private *dev_priv = to_i915(dev);
		@@ -15191,7 +15194,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
		plane = crtc->plane;
		crtc->base.primary->state->visible = true;
		crtc->plane = !plane;
		intel_crtc_disable_noatomic(&crtc->base);
		intel_crtc_disable_noatomic(&crtc->base, ctx);
		crtc->plane = plane;
		}

		@@ -15201,13 +15204,13 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
		* resume. Force-enable the pipe to fix this, the update_dpms
		* call below we restore the pipe to the right state, but leave
		* the required bits on. */
		intel_enable_pipe_a(dev);
		intel_enable_pipe_a(dev, ctx);
		}

		/* Adjust the state of the output pipe according to whether we
		* have active connectors/encoders. */
		if (crtc->active && !intel_crtc_has_encoders(crtc))
		intel_crtc_disable_noatomic(&crtc->base);
		intel_crtc_disable_noatomic(&crtc->base, ctx);

		if (crtc->active \|\| HAS_GMCH_DISPLAY(dev_priv)) {
		/*
		@@ -15505,7 +15508,8 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)
		* and sanitizes it to the current state
		*/
		static void
		intel_modeset_setup_hw_state(struct drm_device *dev)
		intel_modeset_setup_hw_state(struct drm_device *dev,
		struct drm_modeset_acquire_ctx *ctx)
		{
		struct drm_i915_private *dev_priv = to_i915(dev);
		enum pipe pipe;
		@@ -15525,7 +15529,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev)
		for_each_pipe(dev_priv, pipe) {
		crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

		intel_sanitize_crtc(crtc);
		intel_sanitize_crtc(crtc, ctx);
		intel_dump_pipe_config(crtc, crtc->config,
		"[setup_hw_state]");
		}

drivers/gpu/drm/i915/intel_dp_aux_backlight.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,6 @@ static int intel_dp_aux_setup_backlight(struct intel_connector *connector,
		struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);
		struct intel_panel *panel = &connector->panel;

		intel_dp_aux_enable_backlight(connector);

		if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)
		panel->backlight.max = 0xFFFF;
		else

Admin message