Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'drm-fixes-for-v4.15-rc5' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "I've got most of two weeks worth of fixes here due to being on
  holidays last week.

  The main things are:

  - Core:
     * Syncobj fd reference count fix
     * Leasing ioctl misuse fix

   - nouveau regression fixes

   - further amdgpu DC fixes

   - sun4i regression fixes

  I'm not sure I'll see many fixes over next couple of weeks, we'll see
  how we go"

* tag 'drm-fixes-for-v4.15-rc5' of git://people.freedesktop.org/~airlied/linux: (27 commits)
  drm/syncobj: Stop reusing the same struct file for all syncobj -> fd
  drm: move lease init after validation in drm_lease_create
  drm/plane: Make framebuffer refcounting the responsibility of setplane_internal callers
  drm/sun4i: hdmi: Move the mode_valid callback to the encoder
  drm/nouveau: fix obvious memory leak
  drm/i915: Protect DDI port to DPLL map from theoretical race.
  drm/i915/lpe: Remove double-encapsulation of info string
  drm/sun4i: Fix error path handling
  drm/nouveau: use alternate memory type for system-memory buffers with kind != 0
  drm/nouveau: avoid GPU page sizes > PAGE_SIZE for buffer objects in host memory
  drm/nouveau/mmu/gp10b: use correct implementation
  drm/nouveau/pci: do a msi rearm on init
  drm/nouveau/imem/nv50: fix refcount_t warning
  drm/nouveau/bios/dp: support DP Info Table 2.0
  drm/nouveau/fbcon: fix NULL pointer access in nouveau_fbcon_destroy
  drm/amd/display: Fix rehook MST display not light back on
  drm/amd/display: fix missing pixel clock adjustment for dongle
  drm/amd/display: set chroma taps to 1 when not scaling
  drm/amd/display: add pipe locking before front end programing
  drm/sun4i: validate modes for HDMI
  ...
parents 7edc3f20 e7cdf5c8

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+1 −1
Original line number Diff line number Diff line
@@ -2467,7 +2467,7 @@ static int gfx_v9_0_kiq_kcq_enable(struct amdgpu_device *adev) 
				  PACKET3_MAP_QUEUES_PIPE(ring->pipe) |

				  PACKET3_MAP_QUEUES_ME((ring->me == 1 ? 0 : 1)) |

				  PACKET3_MAP_QUEUES_QUEUE_TYPE(0) | /*queue_type: normal compute queue */

				  PACKET3_MAP_QUEUES_ALLOC_FORMAT(1) | /* alloc format: all_on_one_pipe */

				  PACKET3_MAP_QUEUES_ALLOC_FORMAT(0) | /* alloc format: all_on_one_pipe */

				  PACKET3_MAP_QUEUES_ENGINE_SEL(0) | /* engine_sel: compute */

				  PACKET3_MAP_QUEUES_NUM_QUEUES(1)); /* num_queues: must be 1 */

		amdgpu_ring_write(kiq_ring, PACKET3_MAP_QUEUES_DOORBELL_OFFSET(ring->doorbell_index));

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+8 −5
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
		       const struct dm_connector_state *dm_state)

{

	struct drm_display_mode *preferred_mode = NULL;

	const struct drm_connector *drm_connector;

	struct drm_connector *drm_connector;

	struct dc_stream_state *stream = NULL;

	struct drm_display_mode mode = *drm_mode;

	bool native_mode_found = false;
@@ -2355,11 +2355,13 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 


	if (!aconnector->dc_sink) {

		/*

		 * Exclude MST from creating fake_sink

		 * TODO: need to enable MST into fake_sink feature

		 * Create dc_sink when necessary to MST

		 * Don't apply fake_sink to MST

		 */

		if (aconnector->mst_port)

			goto stream_create_fail;

		if (aconnector->mst_port) {

			dm_dp_mst_dc_sink_create(drm_connector);

			goto mst_dc_sink_create_done;

		}



		if (create_fake_sink(aconnector))

			goto stream_create_fail;
@@ -2410,6 +2412,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
stream_create_fail:

dm_state_null:

drm_connector_null:

mst_dc_sink_create_done:

	return stream;

}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ struct amdgpu_dm_connector { 
	struct mutex hpd_lock;



	bool fake_enable;



	bool mst_connected;

};



#define to_amdgpu_dm_connector(x) container_of(x, struct amdgpu_dm_connector, base)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+51 −0
Original line number Diff line number Diff line
@@ -185,6 +185,42 @@ static int dm_connector_update_modes(struct drm_connector *connector, 
	return ret;

}



void dm_dp_mst_dc_sink_create(struct drm_connector *connector)

{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);

	struct edid *edid;

	struct dc_sink *dc_sink;

	struct dc_sink_init_data init_params = {

			.link = aconnector->dc_link,

			.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };



	edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);



	if (!edid) {

		drm_mode_connector_update_edid_property(

			&aconnector->base,

			NULL);

		return;

	}



	aconnector->edid = edid;



	dc_sink = dc_link_add_remote_sink(

		aconnector->dc_link,

		(uint8_t *)aconnector->edid,

		(aconnector->edid->extensions + 1) * EDID_LENGTH,

		&init_params);



	dc_sink->priv = aconnector;

	aconnector->dc_sink = dc_sink;



	amdgpu_dm_add_sink_to_freesync_module(

			connector, aconnector->edid);



	drm_mode_connector_update_edid_property(

					&aconnector->base, aconnector->edid);

}



static int dm_dp_mst_get_modes(struct drm_connector *connector)

{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
@@ -311,6 +347,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
			drm_mode_connector_set_path_property(connector, pathprop);



			drm_connector_list_iter_end(&conn_iter);

			aconnector->mst_connected = true;

			return &aconnector->base;

		}

	}
@@ -363,6 +400,8 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
	 */

	amdgpu_dm_connector_funcs_reset(connector);



	aconnector->mst_connected = true;



	DRM_INFO("DM_MST: added connector: %p [id: %d] [master: %p]\n",

			aconnector, connector->base.id, aconnector->mst_port);
@@ -394,6 +433,8 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
	drm_mode_connector_update_edid_property(

			&aconnector->base,

			NULL);



	aconnector->mst_connected = false;

}



static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)
@@ -404,10 +445,18 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr) 
	drm_kms_helper_hotplug_event(dev);

}



static void dm_dp_mst_link_status_reset(struct drm_connector *connector)

{

	mutex_lock(&connector->dev->mode_config.mutex);

	drm_mode_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);

	mutex_unlock(&connector->dev->mode_config.mutex);

}



static void dm_dp_mst_register_connector(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct amdgpu_device *adev = dev->dev_private;

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);



	if (adev->mode_info.rfbdev)

		drm_fb_helper_add_one_connector(&adev->mode_info.rfbdev->helper, connector);
@@ -416,6 +465,8 @@ static void dm_dp_mst_register_connector(struct drm_connector *connector) 


	drm_connector_register(connector);



	if (aconnector->mst_connected)

		dm_dp_mst_link_status_reset(connector);

}



static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h

+1 −0
Original line number Diff line number Diff line
@@ -31,5 +31,6 @@ struct amdgpu_dm_connector; 


void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

				       struct amdgpu_dm_connector *aconnector);

void dm_dp_mst_dc_sink_create(struct drm_connector *connector);



#endif