Commit bfeb122d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2018-11-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Changes outside i915:
- Connector property to limit max bpc (Radhakrishna)
- Fix LPE audio runtime PM and deinit (Ville)
- DP FEC prep work (Anusha)
- Mark pinned shmemfs pages as unevictable (Kuo-Hsin)
- Backmerge drm-next (Jani)

Inside i915:
- Revert OA UAPI change that lacks userspace (Joonas)
- Register macro cleanup (Jani)
- 32-bit build fixes on pin flags (Chris)
- Fix MG DP mode and PHY gating for HDMI (Imre)
- DP MST race, hpd and irq fixes (Lyude)
- Combo PHY fixes and cleanup (Imre, Lucas)
- Move display init and cleanup under modeset init and cleanup (José)
- PSR fixes (José)
- Subslice size fixes (Daniele)
- Abstract and clean up fixed point helpers (Jani)
- Plane input CSC for YUV to RGB conversion (Uma)
- Break long iterations for get/put shmemfs pages (Chris)
- Improve DDI encoder hw state readout sanity checks (Imre)
- Fix power well leaks for MST (José)
- Scaler fixes (Ville)
- Watermark fixes (Ville)
- Fix VLV/CHV DSI panel orientation readout (Ville)
- ICL rawclock fixes (Paulo)
- Workaround DMC power well request issues (Imre)
- Plane allocation fix (Maarten)
- Transcoder enum value/ordering robustness fixes (Imre)
- UTS_RELEASE build dependency fix (Hans Holmberg)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87k1l4cesj.fsf@intel.com
parents b239499f b4bf44d2

Documentation/vm/unevictable-lru.rst

+5 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ using a number of wrapper functions: 
	Query the address space, and return true if it is completely

	unevictable.



These are currently used in two places in the kernel:

These are currently used in three places in the kernel:



 (1) By ramfs to mark the address spaces of its inodes when they are created,

     and this mark remains for the life of the inode.
@@ -154,6 +154,10 @@ These are currently used in two places in the kernel: 
     swapped out; the application must touch the pages manually if it wants to

     ensure they're in memory.



 (3) By the i915 driver to mark pinned address space until it's unpinned. The

     amount of unevictable memory marked by i915 driver is roughly the bounded

     object size in debugfs/dri/0/i915_gem_objects.





Detecting Unevictable Pages

---------------------------

drivers/gpu/drm/drm_atomic.c

+5 −0
Original line number Diff line number Diff line
@@ -398,6 +398,11 @@ static int drm_atomic_connector_check(struct drm_connector *connector, 
{

	struct drm_crtc_state *crtc_state;

	struct drm_writeback_job *writeback_job = state->writeback_job;

	const struct drm_display_info *info = &connector->display_info;



	state->max_bpc = info->bpc ? info->bpc : 8;

	if (connector->max_bpc_property)

		state->max_bpc = min(state->max_bpc, state->max_requested_bpc);



	if ((connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) || !writeback_job)

		return 0;

drivers/gpu/drm/drm_atomic_helper.c

+4 −0
Original line number Diff line number Diff line
@@ -669,6 +669,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
			if (old_connector_state->link_status !=

			    new_connector_state->link_status)

				new_crtc_state->connectors_changed = true;



			if (old_connector_state->max_requested_bpc !=

			    new_connector_state->max_requested_bpc)

				new_crtc_state->connectors_changed = true;

		}



		if (funcs->atomic_check)

drivers/gpu/drm/drm_atomic_uapi.c

+4 −0
Original line number Diff line number Diff line
@@ -740,6 +740,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, 


		return set_out_fence_for_connector(state->state, connector,

						   fence_ptr);

	} else if (property == connector->max_bpc_property) {

		state->max_requested_bpc = val;

	} else if (connector->funcs->atomic_set_property) {

		return connector->funcs->atomic_set_property(connector,

				state, property, val);
@@ -804,6 +806,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, 
		*val = 0;

	} else if (property == config->writeback_out_fence_ptr_property) {

		*val = 0;

	} else if (property == connector->max_bpc_property) {

		*val = state->max_requested_bpc;

	} else if (connector->funcs->atomic_get_property) {

		return connector->funcs->atomic_get_property(connector,

				state, property, val);

drivers/gpu/drm/drm_connector.c

+41 −0
Original line number Diff line number Diff line
@@ -932,6 +932,13 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list) 
 *	  is no longer protected and userspace should take appropriate action

 *	  (whatever that might be).

 *

 * max bpc:

 *	This range property is used by userspace to limit the bit depth. When

 *	used the driver would limit the bpc in accordance with the valid range

 *	supported by the hardware and sink. Drivers to use the function

 *	drm_connector_attach_max_bpc_property() to create and attach the

 *	property to the connector during initialization.

 *

 * Connectors also have one standardized atomic property:

 *

 * CRTC_ID:
@@ -1599,6 +1606,40 @@ void drm_connector_set_link_status_property(struct drm_connector *connector, 
}

EXPORT_SYMBOL(drm_connector_set_link_status_property);



/**

 * drm_connector_attach_max_bpc_property - attach "max bpc" property

 * @connector: connector to attach max bpc property on.

 * @min: The minimum bit depth supported by the connector.

 * @max: The maximum bit depth supported by the connector.

 *

 * This is used to add support for limiting the bit depth on a connector.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_connector_attach_max_bpc_property(struct drm_connector *connector,

					  int min, int max)

{

	struct drm_device *dev = connector->dev;

	struct drm_property *prop;



	prop = connector->max_bpc_property;

	if (!prop) {

		prop = drm_property_create_range(dev, 0, "max bpc", min, max);

		if (!prop)

			return -ENOMEM;



		connector->max_bpc_property = prop;

	}



	drm_object_attach_property(&connector->base, prop, max);

	connector->state->max_requested_bpc = max;

	connector->state->max_bpc = max;



	return 0;

}

EXPORT_SYMBOL(drm_connector_attach_max_bpc_property);



/**

 * drm_connector_init_panel_orientation_property -

 *	initialize the connecters panel_orientation property

CRA Git | Maintained and supported by SUSTech CRA and CCSE