Commit f4566ed0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "These came in late last week, I wanted to look over the mst one before
  forwarding, but it seems good.

  Just three i915 and one MST fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Commit planes on each crtc separately.
  drm/i915: calculate primary visibility changes instead of calling from set_config
  drm/i915: Only dither on 6bpc panels
  drm/dp/mst: Remove port after removing connector.
parents bf674028 7945dc58

drivers/gpu/drm/drm_dp_mst_topology.c

+13 −6
Original line number Diff line number Diff line
@@ -873,9 +873,10 @@ static void drm_dp_destroy_port(struct kref *kref) 
		   from an EDID retrieval */

		if (port->connector) {

			mutex_lock(&mgr->destroy_connector_lock);

			list_add(&port->connector->destroy_list, &mgr->destroy_connector_list);

			list_add(&port->next, &mgr->destroy_connector_list);

			mutex_unlock(&mgr->destroy_connector_lock);

			schedule_work(&mgr->destroy_connector_work);

			return;

		}

		drm_dp_port_teardown_pdt(port, port->pdt);
@@ -2659,7 +2660,7 @@ static void drm_dp_tx_work(struct work_struct *work) 
static void drm_dp_destroy_connector_work(struct work_struct *work)

{

	struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, destroy_connector_work);

	struct drm_connector *connector;

	struct drm_dp_mst_port *port;



	/*

	 * Not a regular list traverse as we have to drop the destroy
@@ -2668,15 +2669,21 @@ static void drm_dp_destroy_connector_work(struct work_struct *work) 
	 */

	for (;;) {

		mutex_lock(&mgr->destroy_connector_lock);

		connector = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_connector, destroy_list);

		if (!connector) {

		port = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_dp_mst_port, next);

		if (!port) {

			mutex_unlock(&mgr->destroy_connector_lock);

			break;

		}

		list_del(&connector->destroy_list);

		list_del(&port->next);

		mutex_unlock(&mgr->destroy_connector_lock);



		mgr->cbs->destroy_connector(mgr, connector);

		mgr->cbs->destroy_connector(mgr, port->connector);



		drm_dp_port_teardown_pdt(port, port->pdt);



		if (!port->input && port->vcpi.vcpi > 0)

			drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);

		kfree(port);

	}

}

drivers/gpu/drm/i915/intel_atomic.c

+8 −37
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ int intel_atomic_commit(struct drm_device *dev, 
			struct drm_atomic_state *state,

			bool async)

{

	int ret;

	int i;

	struct drm_crtc_state *crtc_state;

	struct drm_crtc *crtc;

	int ret, i;



	if (async) {

		DRM_DEBUG_KMS("i915 does not yet support async commit\n");
@@ -142,48 +143,18 @@ int intel_atomic_commit(struct drm_device *dev, 
		return ret;



	/* Point of no return */



	/*

	 * FIXME:  The proper sequence here will eventually be:

	 *

	 * drm_atomic_helper_swap_state(dev, state)

	 * drm_atomic_helper_commit_modeset_disables(dev, state);

	 * drm_atomic_helper_commit_planes(dev, state);

	 * drm_atomic_helper_commit_modeset_enables(dev, state);

	 * drm_atomic_helper_wait_for_vblanks(dev, state);

	 * drm_atomic_helper_cleanup_planes(dev, state);

	 * drm_atomic_state_free(state);

	 *

	 * once we have full atomic modeset.  For now, just manually update

	 * plane states to avoid clobbering good states with dummy states

	 * while nuclear pageflipping.

	 */

	for (i = 0; i < dev->mode_config.num_total_plane; i++) {

		struct drm_plane *plane = state->planes[i];



		if (!plane)

			continue;



		plane->state->state = state;

		swap(state->plane_states[i], plane->state);

		plane->state->state = NULL;

	}

	drm_atomic_helper_swap_state(dev, state);



	/* swap crtc_scaler_state */

	for (i = 0; i < dev->mode_config.num_crtc; i++) {

		struct drm_crtc *crtc = state->crtcs[i];

		if (!crtc) {

			continue;

		}



		to_intel_crtc(crtc)->config->scaler_state =

			to_intel_crtc_state(state->crtc_states[i])->scaler_state;

	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);



		if (INTEL_INFO(dev)->gen >= 9)

			skl_detach_scalers(to_intel_crtc(crtc));



		drm_atomic_helper_commit_planes_on_crtc(crtc_state);

	}



	drm_atomic_helper_commit_planes(dev, state);

	drm_atomic_helper_wait_for_vblanks(dev, state);

	drm_atomic_helper_cleanup_planes(dev, state);

	drm_atomic_state_free(state);

drivers/gpu/drm/i915/intel_display.c

+15 −44
Original line number Diff line number Diff line
@@ -11826,7 +11826,9 @@ encoder_retry: 
		goto encoder_retry;

	}



	pipe_config->dither = pipe_config->pipe_bpp != base_bpp;

	/* Dithering seems to not pass-through bits correctly when it should, so

	 * only enable it on 6bpc panels. */

	pipe_config->dither = pipe_config->pipe_bpp == 6*3;

	DRM_DEBUG_KMS("plane bpp: %i, pipe bpp: %i, dithering: %i\n",

		      base_bpp, pipe_config->pipe_bpp, pipe_config->dither);
@@ -12624,17 +12626,17 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, 


	modeset_update_crtc_power_domains(state);



	drm_atomic_helper_commit_planes(dev, state);



	/* Now enable the clocks, plane, pipe, and connectors that we set up. */

	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		if (!needs_modeset(crtc->state) || !crtc->state->enable)

		if (!needs_modeset(crtc->state) || !crtc->state->enable) {

			drm_atomic_helper_commit_planes_on_crtc(crtc_state);

			continue;

		}



		update_scanline_offset(to_intel_crtc(crtc));



		dev_priv->display.crtc_enable(crtc);

		intel_crtc_enable_planes(crtc);

		drm_atomic_helper_commit_planes_on_crtc(crtc_state);

	}



	/* FIXME: add subpixel order */
@@ -12891,20 +12893,11 @@ intel_modeset_stage_output_state(struct drm_device *dev, 
	return 0;

}



static bool primary_plane_visible(struct drm_crtc *crtc)

{

	struct intel_plane_state *plane_state =

		to_intel_plane_state(crtc->primary->state);



	return plane_state->visible;

}



static int intel_crtc_set_config(struct drm_mode_set *set)

{

	struct drm_device *dev;

	struct drm_atomic_state *state = NULL;

	struct intel_crtc_state *pipe_config;

	bool primary_plane_was_visible;

	int ret;



	BUG_ON(!set);
@@ -12943,38 +12936,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set) 


	intel_update_pipe_size(to_intel_crtc(set->crtc));



	primary_plane_was_visible = primary_plane_visible(set->crtc);



	ret = intel_set_mode_with_config(set->crtc, pipe_config, true);



	if (ret == 0 &&

	    pipe_config->base.enable &&

	    pipe_config->base.planes_changed &&

	    !needs_modeset(&pipe_config->base)) {

		struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);



		/*

		 * We need to make sure the primary plane is re-enabled if it

		 * has previously been turned off.

		 */

		if (ret == 0 && !primary_plane_was_visible &&

		    primary_plane_visible(set->crtc)) {

			WARN_ON(!intel_crtc->active);

			intel_post_enable_primary(set->crtc);

		}



		/*

		 * In the fastboot case this may be our only check of the

		 * state after boot.  It would be better to only do it on

		 * the first update, but we don't have a nice way of doing that

		 * (and really, set_config isn't used much for high freq page

		 * flipping, so increasing its cost here shouldn't be a big

		 * deal).

		 */

		if (i915.fastboot && ret == 0)

			intel_modeset_check_state(set->crtc->dev);

	}



	if (ret) {

		DRM_DEBUG_KMS("failed to set mode on [CRTC:%d], err = %d\n",

			      set->crtc->base.id, ret);
@@ -13305,6 +13268,9 @@ intel_check_primary_plane(struct drm_plane *plane, 
			 */

			if (IS_BROADWELL(dev))

				intel_crtc->atomic.wait_vblank = true;



			if (crtc_state)

				intel_crtc->atomic.post_enable_primary = true;

		}



		/*
@@ -13317,6 +13283,10 @@ intel_check_primary_plane(struct drm_plane *plane, 
		if (!state->visible || !fb)

			intel_crtc->atomic.disable_ips = true;



		if (!state->visible && old_state->visible &&

		    crtc_state && !needs_modeset(&crtc_state->base))

			intel_crtc->atomic.pre_disable_primary = true;



		intel_crtc->atomic.fb_bits |=

			INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
@@ -15034,6 +15004,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		struct intel_plane_state *plane_state;



		memset(crtc->config, 0, sizeof(*crtc->config));

		crtc->config->base.crtc = &crtc->base;



		crtc->config->quirks |= PIPE_CONFIG_QUIRK_INHERITED_MODE;

include/drm/drm_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -743,8 +743,6 @@ struct drm_connector { 
	uint8_t num_h_tile, num_v_tile;

	uint8_t tile_h_loc, tile_v_loc;

	uint16_t tile_h_size, tile_v_size;



	struct list_head destroy_list;

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE