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

Merge tag 'drm-intel-next-queued-2020-11-03' of... 

Merge tag 'drm-intel-next-queued-2020-11-03' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

drm/i915 features for v5.11

Highlights:
- More DG1 enabling (Lucas, Matt, Aditya, Anshuman, Clinton, Matt, Stuart, Venkata)
- Integer scaling filter support (Pankaj Bharadiya)
- Asynchronous flip support (Karthik)

Generic:
- Fix gen12 forcewake tables (Matt)
- Haswell PCI ID updates (Alexei Podtelezhnikov)

Display:
- ICL+ DSI command mode enabling (Vandita)
- Shutdown displays grafecully on reboot/shutdown (Ville)
- Don't register display debugfs when there is no display (Lucas)
- Fix RKL CDCLK table (Matt)
- Limit EHL/JSL eDP to HBR2 (José)
- Handle incorrectly set (by BIOS) PLLs and DP link rates at probe (Imre)
- Fix mode valid check wrt bpp for "YCbCr 4:2:0 only" modes (Ville)
- State checker and dump fixes (Ville)
- DP AUX backlight updates (Aaron Ma, Sean Paul)
- Add DP LTTPR non-transparent link training mode (Imre)
- PSR2 selective fetch enabling (José)
- VBT updates (José)
- HDCP updates (Ramalingam)

Cleanups and refactoring:
- HPD pin, AUX channel, and Type-C port identifier cleanup (Ville)
- Hotplug and irq refactoring (Ville)
- Better DDI encoder and AUX channel names (Ville)
- Color LUT code cleanups (Ville)
- Combo PHY code cleanups (Ville)
- LSPCON code cleanups (Ville)
- Documentation fixes (Mauro, Chris)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87o8kehbaj.fsf@intel.com
parents 1cd260a7 139caf7c

Documentation/gpu/i915.rst

+6 −0
Original line number Diff line number Diff line
@@ -118,6 +118,12 @@ Atomic Plane Helpers 
.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c

   :internal:



Asynchronous Page Flip

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



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_display.c

   :doc: asynchronous flip implementation



Output Probing

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

drivers/gpu/drm/drm_atomic_uapi.c

+8 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, 
			return -EFAULT;



		set_out_fence_for_crtc(state->state, crtc, fence_ptr);

	} else if (property == crtc->scaling_filter_property) {

		state->scaling_filter = val;

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

		return crtc->funcs->atomic_set_property(crtc, state, property, val);

	} else {
@@ -503,6 +505,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, 
		*val = (state->gamma_lut) ? state->gamma_lut->base.id : 0;

	else if (property == config->prop_out_fence_ptr)

		*val = 0;

	else if (property == crtc->scaling_filter_property)

		*val = state->scaling_filter;

	else if (crtc->funcs->atomic_get_property)

		return crtc->funcs->atomic_get_property(crtc, state, property, val);

	else
@@ -585,6 +589,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, 
					sizeof(struct drm_rect),

					&replaced);

		return ret;

	} else if (property == plane->scaling_filter_property) {

		state->scaling_filter = val;

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

		return plane->funcs->atomic_set_property(plane, state,

				property, val);
@@ -643,6 +649,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, 
	} else if (property == config->prop_fb_damage_clips) {

		*val = (state->fb_damage_clips) ?

			state->fb_damage_clips->base.id : 0;

	} else if (property == plane->scaling_filter_property) {

		*val = state->scaling_filter;

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

		return plane->funcs->atomic_get_property(plane, state, property, val);

	} else {

drivers/gpu/drm/drm_blend.c

+13 −0
Original line number Diff line number Diff line
@@ -194,6 +194,19 @@ 
 * Note that all the property extensions described here apply either to the

 * plane or the CRTC (e.g. for the background color, which currently is not

 * exposed and assumed to be black).

 *

 * SCALING_FILTER:

 *

 *     Indicates scaling filter to be used for plane scaler

 *

 *     The value of this property can be one of the following:

 *     Default:

 *             Driver's default scaling filter

 *     Nearest Neighbor:

 *             Nearest Neighbor scaling filter

 *

 * Drivers can set up this property for a plane by calling

 * drm_plane_create_scaling_filter_property

 */



/**

drivers/gpu/drm/drm_crtc.c

+40 −0
Original line number Diff line number Diff line
@@ -229,6 +229,15 @@ struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc) 
 * 	user-space must set this property to 0.

 *

 * 	Setting MODE_ID to 0 will release reserved resources for the CRTC.

 * SCALING_FILTER:

 *	Atomic property for setting the scaling filter for CRTC scaler

 *

 *	The value of this property can be one of the following:

 *	Default:

 *		Driver's default scaling filter

 *	Nearest Neighbor:

 *		Nearest Neighbor scaling filter

 *

 */



/**
@@ -774,3 +783,34 @@ int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj, 


	return ret;

}



/**

 * drm_crtc_create_scaling_filter_property - create a new scaling filter

 * property

 *

 * @crtc: drm CRTC

 * @supported_filters: bitmask of supported scaling filters, must include

 *		       BIT(DRM_SCALING_FILTER_DEFAULT).

 *

 * This function lets driver to enable the scaling filter property on a given

 * CRTC.

 *

 * RETURNS:

 * Zero for success or -errno

 */

int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc,

					    unsigned int supported_filters)

{

	struct drm_property *prop =

		drm_create_scaling_filter_prop(crtc->dev, supported_filters);



	if (IS_ERR(prop))

		return PTR_ERR(prop);



	drm_object_attach_property(&crtc->base, prop,

				   DRM_SCALING_FILTER_DEFAULT);

	crtc->scaling_filter_property = prop;



	return 0;

}

EXPORT_SYMBOL(drm_crtc_create_scaling_filter_property);

drivers/gpu/drm/drm_crtc_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ int drm_crtc_force_disable(struct drm_crtc *crtc); 


struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc);



struct drm_property *

drm_create_scaling_filter_prop(struct drm_device *dev,

			       unsigned int supported_filters);

/* IOCTLs */

int drm_mode_getcrtc(struct drm_device *dev,

		     void *data, struct drm_file *file_priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE