Blobifiers (FKA GET_PLANE2)
Subsystems (37)
v2 cover Blobifiers (FKA GET_PLANE2)
Second attempt (although most patches are much further along than that) and the blob property for modifiers.
This small series adds the DRM blob property that allows clients to be made aware of per plane modifiers and the formats which are supported in conjunction with those modifiers. This interface will allow clients to create buffers for scanout with a good set of modifiers, and later import those buffers (through EGL already, and Vulkan WSI later) into a graphics runtime. EGL/WSI will provide similar interfaces for rendering - modifiers which can be used for rendering.
Ben Widawsky (4):
drm: Plumb modifiers through plane init
drm: Create a format/modifier blob
drm/i915: Add format modifiers for Intel
drm/i915: Add support for CCS modifiers
drivers/gpu/drm/arc/arcpgu_crtc.c | 1 + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/armada/armada_crtc.c | 1 + drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 3 +- drivers/gpu/drm/drm_mode_config.c | 7 + drivers/gpu/drm/drm_modeset_helper.c | 1 + drivers/gpu/drm/drm_plane.c | 120 +++++++++++++++++- drivers/gpu/drm/drm_simple_kms_helper.c | 3 + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 148 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_sprite.c | 162 +++++++++++++++++++++++- drivers/gpu/drm/imx/ipuv3-plane.c | 4 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/meson/meson_plane.c | 1 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.c | 5 +- drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- drivers/gpu/drm/pl111/pl111_display.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_layer.c | 2 +- drivers/gpu/drm/tegra/dc.c | 12 +- drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- include/drm/drm_mode_config.h | 6 + include/drm/drm_plane.h | 22 +++- include/drm/drm_simple_kms_helper.h | 1 + include/uapi/drm/drm_fourcc.h | 11 ++ include/uapi/drm/drm_mode.h | 50 ++++++++ 48 files changed, 576 insertions(+), 52 deletions(-)
Signature · 6 lines
2.13.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/4 drm: Plumb modifiers through plane init
This is the plumbing for supporting fb modifiers on planes. Modifiers have already been introduced to some extent, but this series will extend this to allow querying modifiers per plane. Based on this, the client to enable optimal modifications for framebuffers.
This patch simply allows the DRM drivers to initialize their list of supported modifiers upon initializing the plane.
v2: A minor addition from Daniel
v3:
* Updated commit message
* s/INVALID/DRM_FORMAT_MOD_INVALID (Liviu)
* Remove some excess newlines (Liviu)
* Update comment for > 64 modifiers (Liviu)
v4: Minor comment adjustments (Liviu)
v5: Some new platforms added due to rebase
v6: Add some missed plane inits (or maybe they're new - who knows at this point) (Daniel)
--- drivers/gpu/drm/arc/arcpgu_crtc.c | 1 + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/armada/armada_crtc.c | 1 + drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 3 ++- drivers/gpu/drm/drm_modeset_helper.c | 1 + drivers/gpu/drm/drm_plane.c | 36 ++++++++++++++++++++++++- drivers/gpu/drm/drm_simple_kms_helper.c | 3 +++ drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 5 +++- drivers/gpu/drm/i915/intel_sprite.c | 4 +-- drivers/gpu/drm/imx/ipuv3-plane.c | 4 +-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/meson/meson_plane.c | 1 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +-- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.c | 5 ++-- drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- drivers/gpu/drm/pl111/pl111_display.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +-- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +-- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_layer.c | 2 +- drivers/gpu/drm/tegra/dc.c | 12 ++++----- drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +-- drivers/gpu/drm/zte/zx_plane.c | 2 +- include/drm/drm_plane.h | 22 ++++++++++++++- include/drm/drm_simple_kms_helper.h | 1 + include/uapi/drm/drm_fourcc.h | 11 ++++++++ 44 files changed, 130 insertions(+), 49 deletions(-)
drivers/gpu/drm/arc/arcpgu_crtc.c +1 -0
@@ -217,6 +217,7 @@ static struct drm_plane *arc_pgu_plane_init(struct drm_device *drm) ret =drm_universal_plane_init (drm, plane,0xff , &arc_pgu_plane_funcs, formats,ARRAY_SIZE (formats), +NULL ,DRM_PLANE_TYPE_PRIMARY ,NULL );if (ret)return ERR_PTR (ret);
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -0
@@ -315,6 +315,7 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) ret =drm_universal_plane_init (drm, plane,0xff , &hdlcd_plane_funcs, formats,ARRAY_SIZE (formats), +NULL ,DRM_PLANE_TYPE_PRIMARY ,NULL );if (ret) {return ERR_PTR (ret);
drivers/gpu/drm/arm/malidp_planes.c +1 -1
@@ -398,7 +398,7 @@ int malidp_de_planes_init(struct drm_device *drm)DRM_PLANE_TYPE_OVERLAY ; ret =drm_universal_plane_init (drm, &plane->base, crtcs, &malidp_de_plane_funcs, formats, - n, plane_type,NULL ); + n,NULL , plane_type,NULL );if (ret <0 ) goto cleanup;
drivers/gpu/drm/armada/armada_crtc.c +1 -0
@@ -1269,6 +1269,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, &armada_primary_plane_funcs, armada_primary_formats,ARRAY_SIZE (armada_primary_formats), +NULL , DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {kfree (primary);
drivers/gpu/drm/armada/armada_overlay.c +1 -0
@@ -460,6 +460,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs) &armada_ovl_plane_funcs, armada_ovl_formats,ARRAY_SIZE (armada_ovl_formats), +NULL , DRM_PLANE_TYPE_OVERLAY, NULL);if (ret) {kfree (dplane);
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +2 -1
@@ -1087,7 +1087,8 @@ static int atmel_hlcdc_plane_create(struct drm_device *dev, ret =drm_universal_plane_init (dev, &plane->base,0 , &layer_plane_funcs, desc->formats->formats, - desc->formats->nformats, type,NULL ); + desc->formats->nformats, +NULL , type,NULL );if (ret)return ret;
drivers/gpu/drm/drm_modeset_helper.c +1 -0
@@ -124,6 +124,7 @@ static struct drm_plane *create_primary_plane(struct drm_device *dev) &drm_primary_helper_funcs, safe_modeset_formats,ARRAY_SIZE (safe_modeset_formats), +NULL , DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {kfree (primary);
drivers/gpu/drm/drm_plane.c +35 -1
@@ -70,6 +70,8 @@ static unsigned int drm_num_planes(struct drm_device *dev)* @funcs: callbacks for the new plane * @formats: array of supported formats (DRM_FORMAT\_\*) * @format_count: number of elements in @formats +* @format_modifiers: array of struct drm_format modifiers terminated by +* DRM_FORMAT_MOD_INVALID * @type: type of plane (overlay, primary, cursor) * @name: printf style format string for the plane name, or NULL for default name *
@@ -82,10 +84,12 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,uint32_t possible_crtcs, const struct drm_plane_funcs *funcs, const uint32_t *formats, unsigned int format_count, + const uint64_t *format_modifiers, enum drm_plane_type type, const char *name, ...) { struct drm_mode_config *config = &dev->mode_config; +unsigned int format_modifier_count =0 ;int ret; ret =drm_mode_object_add (dev, &plane->base,DRM_MODE_OBJECT_PLANE );
@@ -105,6 +109,31 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,return -ENOMEM ; } +/* +* First driver to need more than 64 formats needs to fix this. Each +* format is encoded as a bit and the current code only supports a u64. +*/ +if (WARN_ON (format_count >64 )) +return -EINVAL ; + +if (format_modifiers) { +const uint64_t *temp_modifiers = format_modifiers; +while (*temp_modifiers++ !=DRM_FORMAT_MOD_INVALID ) + format_modifier_count++; + } + + plane->modifier_count = format_modifier_count; + plane->modifiers =kmalloc_array (format_modifier_count, +sizeof (format_modifiers[0 ]), +GFP_KERNEL ); + +if (format_modifier_count && !plane->modifiers) { +DRM_DEBUG_KMS ("out of memory when allocating plane\n" ); +kfree (plane->format_types); +drm_mode_object_unregister (dev, &plane->base); +return -ENOMEM ; + } +if (name) {va_list ap;
@@ -117,12 +146,15 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, }if (!plane->name) {kfree (plane->format_types); +kfree (plane->modifiers);drm_mode_object_unregister (dev, &plane->base);return -ENOMEM ; }memcpy (plane->format_types, formats, format_count *sizeof (uint32_t )); plane->format_count = format_count; +memcpy (plane->modifiers, format_modifiers, + format_modifier_count *sizeof (format_modifiers[0 ])); plane->possible_crtcs = possible_crtcs; plane->type = type;
@@ -205,7 +237,8 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, type = is_primary ?DRM_PLANE_TYPE_PRIMARY :DRM_PLANE_TYPE_OVERLAY ;return drm_universal_plane_init (dev, plane, possible_crtcs, funcs, - formats, format_count, type,NULL ); + formats, format_count, +NULL , type,NULL ); }EXPORT_SYMBOL (drm_plane_init);
@@ -224,6 +257,7 @@ void drm_plane_cleanup(struct drm_plane *plane)drm_modeset_lock_fini (&plane->mutex);kfree (plane->format_types); +kfree (plane->modifiers);drm_mode_object_unregister (dev, &plane->base);BUG_ON (list_empty (&plane->head));
drivers/gpu/drm/drm_simple_kms_helper.c +3 -0
@@ -199,6 +199,7 @@ EXPORT_SYMBOL(drm_simple_display_pipe_attach_bridge);* @funcs: callbacks for the display pipe (optional) * @formats: array of supported formats (DRM_FORMAT\_\*) * @format_count: number of elements in @formats +* @format_modifiers: array of formats modifiers * @connector: connector to attach and register (optional) * * Sets up a display pipeline which consist of a really simple
@@ -219,6 +220,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,struct drm_simple_display_pipe *pipe, const struct drm_simple_display_pipe_funcs *funcs, const uint32_t *formats, unsigned int format_count, + const uint64_t *format_modifiers, struct drm_connector *connector) { struct drm_encoder *encoder = &pipe->encoder;
@@ -233,6 +235,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev, ret =drm_universal_plane_init (dev, plane,0 , &drm_simple_kms_plane_funcs, formats, format_count, + format_modifiers,DRM_PLANE_TYPE_PRIMARY ,NULL );if (ret)return ret;
drivers/gpu/drm/exynos/exynos_drm_plane.c +1 -1
@@ -283,7 +283,7 @@ int exynos_plane_init(struct drm_device *dev, &exynos_plane_funcs, config->pixel_formats, config->num_pixel_formats, - config->type, NULL); + NULL, config->type, NULL);if (err) {DRM_ERROR ("failed to initialize plane\n" );return err;
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c +1 -1
@@ -224,7 +224,7 @@ struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev) &fsl_dcu_drm_plane_funcs, fsl_dcu_drm_plane_formats,ARRAY_SIZE (fsl_dcu_drm_plane_formats), - DRM_PLANE_TYPE_PRIMARY, NULL); + NULL, DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {kfree (primary); primary =NULL ;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +1 -0
@@ -181,6 +181,7 @@ static struct drm_plane *hibmc_plane_init(struct hibmc_drm_private *priv) ret =drm_universal_plane_init (dev, plane,1 , &hibmc_plane_funcs, channel_formats1,ARRAY_SIZE (channel_formats1), +NULL ,DRM_PLANE_TYPE_PRIMARY ,NULL );if (ret) {
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +1 -1
@@ -910,7 +910,7 @@ static int ade_plane_init(struct drm_device *dev, struct ade_plane *aplane,return ret; ret =drm_universal_plane_init (dev, &aplane->base,1 , &ade_plane_funcs, - fmts, fmts_cnt, type,NULL ); + fmts, fmts_cnt,NULL , type,NULL );if (ret) {DRM_ERROR ("fail to init plane, ch=%d\n" , aplane->ch);return ret;
drivers/gpu/drm/i915/intel_display.c +4 -1
@@ -13019,18 +13019,21 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, +NULL ,DRM_PLANE_TYPE_PRIMARY ,"plane 1%c" ,pipe_name (pipe)); else if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, +NULL ,DRM_PLANE_TYPE_PRIMARY ,"primary %c" ,pipe_name (pipe)); else ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, +NULL ,DRM_PLANE_TYPE_PRIMARY ,"plane %c" ,plane_name (primary->plane));if (ret)
@@ -13116,7 +13119,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,0 , &intel_cursor_plane_funcs, intel_cursor_formats,ARRAY_SIZE (intel_cursor_formats), -DRM_PLANE_TYPE_CURSOR , +NULL ,DRM_PLANE_TYPE_CURSOR , "cursor %c", pipe_name(pipe));if (ret) goto fail;
drivers/gpu/drm/i915/intel_sprite.c +2 -2
@@ -1170,13 +1170,13 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, ret =drm_universal_plane_init (&dev_priv->drm, &intel_plane->base, possible_crtcs, &intel_plane_funcs, plane_formats, num_plane_formats, -DRM_PLANE_TYPE_OVERLAY , +NULL ,DRM_PLANE_TYPE_OVERLAY ,"plane %d%c" , plane +2 ,pipe_name (pipe)); else ret =drm_universal_plane_init (&dev_priv->drm, &intel_plane->base, possible_crtcs, &intel_plane_funcs, plane_formats, num_plane_formats, -DRM_PLANE_TYPE_OVERLAY , +NULL ,DRM_PLANE_TYPE_OVERLAY ,"sprite %c" ,sprite_name (pipe, plane));if (ret) goto fail;
drivers/gpu/drm/imx/ipuv3-plane.c +2 -2
@@ -718,8 +718,8 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu, ret =drm_universal_plane_init (dev, &ipu_plane->base, possible_crtcs, &ipu_plane_funcs, ipu_plane_formats, -ARRAY_SIZE (ipu_plane_formats), type, -NULL ); +ARRAY_SIZE (ipu_plane_formats), +NULL , type,NULL );if (ret) {DRM_ERROR ("failed to initialize plane\n" );kfree (ipu_plane);
drivers/gpu/drm/mediatek/mtk_drm_plane.c +1 -1
@@ -175,7 +175,7 @@ int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane, err =drm_universal_plane_init (dev, plane, possible_crtcs, &mtk_plane_funcs, formats, -ARRAY_SIZE (formats), type,NULL ); +ARRAY_SIZE (formats),NULL , type,NULL );if (err) {DRM_ERROR ("failed to initialize plane\n" );return err;
drivers/gpu/drm/meson/meson_plane.c +1 -0
@@ -223,6 +223,7 @@ int meson_plane_create(struct meson_drm *priv) &meson_plane_funcs, supported_drm_formats,ARRAY_SIZE (supported_drm_formats), +NULL , DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane");drm_plane_helper_add (plane, &meson_plane_helper_funcs);
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +1 -1
@@ -401,7 +401,7 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, type = private_plane ?DRM_PLANE_TYPE_PRIMARY :DRM_PLANE_TYPE_OVERLAY ; ret =drm_universal_plane_init (dev, plane,0xff , &mdp4_plane_funcs, mdp4_plane->formats, mdp4_plane->nformats, - type,NULL ); +NULL , type,NULL );if (ret) goto fail;
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +2 -2
@@ -1139,12 +1139,12 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, ret =drm_universal_plane_init (dev, plane,0xff , &mdp5_cursor_plane_funcs, mdp5_plane->formats, mdp5_plane->nformats, - type,NULL ); +NULL , type,NULL ); else ret =drm_universal_plane_init (dev, plane,0xff , &mdp5_plane_funcs, mdp5_plane->formats, mdp5_plane->nformats, - type,NULL ); +NULL , type,NULL );if (ret) goto fail;
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -1
@@ -190,7 +190,7 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags) } ret =drm_simple_display_pipe_init (drm, &mxsfb->pipe, &mxsfb_funcs, - mxsfb_formats,ARRAY_SIZE (mxsfb_formats), + mxsfb_formats,ARRAY_SIZE (mxsfb_formats),NULL , &mxsfb->connector);if (ret <0 ) {dev_err (drm->dev,"Cannot setup simple display pipe\n" );
drivers/gpu/drm/nouveau/nv50_display.c +3 -2
@@ -1083,8 +1083,9 @@ nv50_wndw_ctor(const struct nv50_wndw_func *func, struct drm_device *dev, wndw->func = func; wndw->dmac = dmac; - ret =drm_universal_plane_init (dev, &wndw->plane,0 , &nv50_wndw, format, - nformat, type,"%s-%d" , name, index); + ret =drm_universal_plane_init (dev, &wndw->plane,0 , &nv50_wndw, + format, nformat,NULL , + type,"%s-%d" , name, index);if (ret)return ret;
drivers/gpu/drm/omapdrm/omap_plane.c +1 -1
@@ -291,7 +291,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, ret =drm_universal_plane_init (dev, plane, possible_crtcs, &omap_plane_funcs, formats, - nformats, type,NULL ); + nformats,NULL , type,NULL );if (ret <0 ) goto error;
drivers/gpu/drm/pl111/pl111_display.c +1 -1
@@ -457,7 +457,7 @@ int pl111_display_init(struct drm_device *drm) ret =drm_simple_display_pipe_init (drm, &priv->pipe, &pl111_display_funcs, formats,ARRAY_SIZE (formats), - &priv->connector.connector); +NULL , &priv->connector.connector);if (ret)return ret;
drivers/gpu/drm/qxl/qxl_display.c +1 -1
@@ -784,7 +784,7 @@ static struct drm_plane *qxl_create_plane(struct qxl_device *qdev, err =drm_universal_plane_init (&qdev->ddev, plane, possible_crtcs, funcs, formats, num_formats, - type,NULL ); +NULL , type,NULL );if (err) goto free_plane;
drivers/gpu/drm/rcar-du/rcar_du_plane.c +2 -2
@@ -743,8 +743,8 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp) ret =drm_universal_plane_init (rcdu->ddev, &plane->plane, crtcs, &rcar_du_plane_funcs, formats, -ARRAY_SIZE (formats), type, -NULL ); +ARRAY_SIZE (formats), +NULL , type,NULL );if (ret <0 )return ret;
drivers/gpu/drm/rcar-du/rcar_du_vsp.c +2 -2
@@ -439,8 +439,8 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp)1 << vsp->index, &rcar_du_vsp_plane_funcs, formats_kms, -ARRAY_SIZE (formats_kms), type, - NULL); +ARRAY_SIZE (formats_kms), + NULL, type, NULL);if (ret <0 )return ret;
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +2 -2
@@ -1293,7 +1293,7 @@ static int vop_create_crtc(struct vop *vop)0 , &vop_plane_funcs, win_data->phy->data_formats, win_data->phy->nformats, - win_data->type, NULL); + NULL, win_data->type, NULL);if (ret) {DRM_DEV_ERROR (vop->dev,"failed to init plane %d\n" , ret);
@@ -1332,7 +1332,7 @@ static int vop_create_crtc(struct vop *vop) &vop_plane_funcs, win_data->phy->data_formats, win_data->phy->nformats, - win_data->type, NULL); + NULL, win_data->type, NULL);if (ret) {DRM_DEV_ERROR (vop->dev,"failed to init overlay %d\n" , ret);
drivers/gpu/drm/sti/sti_cursor.c +1 -1
@@ -392,7 +392,7 @@ struct drm_plane *sti_cursor_create(struct drm_device *drm_dev, &sti_cursor_plane_helpers_funcs, cursor_supported_formats,ARRAY_SIZE (cursor_supported_formats), - DRM_PLANE_TYPE_CURSOR, NULL); + NULL, DRM_PLANE_TYPE_CURSOR, NULL);if (res) {DRM_ERROR ("Failed to initialize universal plane\n" ); goto err_plane;
drivers/gpu/drm/sti/sti_gdp.c +1 -1
@@ -931,7 +931,7 @@ struct drm_plane *sti_gdp_create(struct drm_device *drm_dev, &sti_gdp_plane_helpers_funcs, gdp_supported_formats,ARRAY_SIZE (gdp_supported_formats), - type, NULL); + NULL, type, NULL);if (res) {DRM_ERROR ("Failed to initialize universal plane\n" ); goto err;
drivers/gpu/drm/sti/sti_hqvdp.c +1 -1
@@ -1298,7 +1298,7 @@ static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev, &sti_hqvdp_plane_helpers_funcs, hqvdp_supported_formats,ARRAY_SIZE (hqvdp_supported_formats), - DRM_PLANE_TYPE_OVERLAY, NULL); + NULL, DRM_PLANE_TYPE_OVERLAY, NULL);if (res) {DRM_ERROR ("Failed to initialize universal plane\n" );return NULL ;
drivers/gpu/drm/stm/ltdc.c +1 -1
@@ -735,7 +735,7 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev, ret =drm_universal_plane_init (ddev, plane, possible_crtcs, <dc_plane_funcs, formats, nb_fmt, - type,NULL ); +NULL , type,NULL );if (ret <0 )return 0 ;
drivers/gpu/drm/sun4i/sun4i_layer.c +1 -1
@@ -115,7 +115,7 @@ static struct sun4i_layer *sun4i_layer_init_one(struct drm_device *drm, ret =drm_universal_plane_init (drm, &layer->plane,0 , &sun4i_backend_layer_funcs, plane->formats, plane->nformats, - plane->type,NULL ); +NULL , plane->type,NULL );if (ret) {dev_err (drm->dev,"Couldn't initialize layer\n" );return ERR_PTR (ret);
drivers/gpu/drm/tegra/dc.c +6 -6
@@ -678,8 +678,8 @@ static struct drm_plane *tegra_dc_primary_plane_create(struct drm_device *drm, err =drm_universal_plane_init (drm, &plane->base, possible_crtcs, &tegra_primary_plane_funcs, formats, - num_formats,DRM_PLANE_TYPE_PRIMARY , -NULL ); + num_formats,NULL , +DRM_PLANE_TYPE_PRIMARY ,NULL );if (err <0 ) {kfree (plane);return ERR_PTR (err);
@@ -844,8 +844,8 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm, err =drm_universal_plane_init (drm, &plane->base,1 << dc->pipe, &tegra_cursor_plane_funcs, formats, - num_formats,DRM_PLANE_TYPE_CURSOR , -NULL ); + num_formats,NULL , +DRM_PLANE_TYPE_CURSOR ,NULL );if (err <0 ) {kfree (plane);return ERR_PTR (err);
@@ -906,8 +906,8 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm, err =drm_universal_plane_init (drm, &plane->base,1 << dc->pipe, &tegra_overlay_plane_funcs, formats, - num_formats,DRM_PLANE_TYPE_OVERLAY , -NULL ); + num_formats,NULL , +DRM_PLANE_TYPE_OVERLAY ,NULL );if (err <0 ) {kfree (plane);return ERR_PTR (err);
drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c +1 -1
@@ -225,7 +225,7 @@ tinydrm_display_pipe_init(struct tinydrm_device *tdev,return PTR_ERR (connector); ret =drm_simple_display_pipe_init (drm, &tdev->pipe, funcs, formats, - format_count, connector); + format_count,NULL , connector);if (ret)return ret;
drivers/gpu/drm/vc4/vc4_plane.c +1 -1
@@ -902,7 +902,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, ret =drm_universal_plane_init (dev, plane,0 , &vc4_plane_funcs, formats, num_formats, - type,NULL ); +NULL , type,NULL );drm_plane_helper_add (plane, &vc4_plane_helper_funcs);
drivers/gpu/drm/virtio/virtgpu_plane.c +1 -1
@@ -298,7 +298,7 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, ret =drm_universal_plane_init (dev, plane,1 << index, &virtio_gpu_plane_funcs, formats, nformats, - type,NULL ); +NULL , type,NULL );if (ret) goto err_plane_init;
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -2
@@ -428,7 +428,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_ldu_plane_funcs, vmw_primary_plane_formats,ARRAY_SIZE (vmw_primary_plane_formats), - DRM_PLANE_TYPE_PRIMARY, NULL); + NULL, DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {DRM_ERROR ("Failed to initialize primary plane" ); goto err_free;
@@ -443,7 +443,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_ldu_cursor_funcs, vmw_cursor_plane_formats,ARRAY_SIZE (vmw_cursor_plane_formats), - DRM_PLANE_TYPE_CURSOR, NULL); + NULL, DRM_PLANE_TYPE_CURSOR, NULL);if (ret) {DRM_ERROR ("Failed to initialize cursor plane" );drm_plane_cleanup (&ldu->base.primary);
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +2 -2
@@ -624,7 +624,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_sou_plane_funcs, vmw_primary_plane_formats,ARRAY_SIZE (vmw_primary_plane_formats), - DRM_PLANE_TYPE_PRIMARY, NULL); + NULL, DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {DRM_ERROR ("Failed to initialize primary plane" ); goto err_free;
@@ -639,7 +639,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_sou_cursor_funcs, vmw_cursor_plane_formats,ARRAY_SIZE (vmw_cursor_plane_formats), - DRM_PLANE_TYPE_CURSOR, NULL); + NULL, DRM_PLANE_TYPE_CURSOR, NULL);if (ret) {DRM_ERROR ("Failed to initialize cursor plane" );drm_plane_cleanup (&sou->base.primary);
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +2 -2
@@ -1475,7 +1475,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_stdu_plane_funcs, vmw_primary_plane_formats,ARRAY_SIZE (vmw_primary_plane_formats), - DRM_PLANE_TYPE_PRIMARY, NULL); + NULL, DRM_PLANE_TYPE_PRIMARY, NULL);if (ret) {DRM_ERROR ("Failed to initialize primary plane" ); goto err_free;
@@ -1490,7 +1490,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)0 , &vmw_stdu_cursor_funcs, vmw_cursor_plane_formats,ARRAY_SIZE (vmw_cursor_plane_formats), - DRM_PLANE_TYPE_CURSOR, NULL); + NULL, DRM_PLANE_TYPE_CURSOR, NULL);if (ret) {DRM_ERROR ("Failed to initialize cursor plane" );drm_plane_cleanup (&stdu->base.primary);
drivers/gpu/drm/zte/zx_plane.c +1 -1
@@ -540,7 +540,7 @@ int zx_plane_init(struct drm_device *drm, struct zx_plane *zplane, ret =drm_universal_plane_init (drm, plane,VOU_CRTC_MASK , &zx_plane_funcs, formats, format_count, - type,NULL ); +NULL , type,NULL );if (ret) {DRM_DEV_ERROR (dev,"failed to init universal plane: %d\n" , ret);return ret;
include/drm/drm_plane.h +21 -1
@@ -392,6 +392,22 @@ struct drm_plane_funcs {*/ void (*atomic_print_state)(struct drm_printer *p,const struct drm_plane_state *state); + +/** +* @format_mod_supported: +* +* This optional hook is used for the DRM to determine if the given +* format/modifier combination is valid for the plane. This allows the +* DRM to generate the correct format bitmask (which formats apply to +* which modifier). +* +* Returns: +* +* True if the given modifier is valid for that format on the plane. +* False otherwise. +*/ +bool (*format_mod_supported)(struct drm_plane *plane,uint32_t format, +uint64_t modifier); };/**
@@ -487,6 +503,9 @@ struct drm_plane {unsigned int format_count;bool format_default; +uint64_t *modifiers; +unsigned int modifier_count; +struct drm_crtc *crtc;struct drm_framebuffer *fb;
@@ -527,13 +546,14 @@ struct drm_plane {#define obj_to_plane (x) container_of(x, struct drm_plane, base) -__printf(8, 9) +__printf(9, 10)int drm_universal_plane_init (struct drm_device *dev,struct drm_plane *plane,uint32_t possible_crtcs,const struct drm_plane_funcs *funcs,const uint32_t *formats,unsigned int format_count, +const uint64_t *format_modifiers,enum drm_plane_type type,const char *name, ...); int drm_plane_init(struct drm_device *dev,
include/drm/drm_simple_kms_helper.h +1 -0
@@ -122,6 +122,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,struct drm_simple_display_pipe *pipe, const struct drm_simple_display_pipe_funcs *funcs, const uint32_t *formats, unsigned int format_count, + const uint64_t *format_modifiers, struct drm_connector *connector);#endif /* __LINUX_DRM_SIMPLE_KMS_HELPER_H */
include/uapi/drm/drm_fourcc.h +11 -0
@@ -185,6 +185,8 @@ extern "C" {#define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07/* add more to the end as needed */ +#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1) +#define fourcc_mod_code (vendor, val) \ ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL))
@@ -197,6 +199,15 @@ extern "C" {*/ /* +* Invalid Modifier +* +* This modifier can be used as a sentinel to terminate the format modifiers +* list, or to initialize a variable with an invalid modifier. It might also be +* used to report an error back to userspace for certain APIs. +*/ +#define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED) + +/* * Linear Layout * * Just plain linear layout. Note that this is different from no specifying any
Signature · 6 lines
2.13.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH 1/4] drm: Plumb modifiers through plane init
All warnings (new ones prefixed by >>):
Hi Ben,
[auto build test WARNING on drm/drm-next]
[also build test WARNING on v4.13-rc2 next-20170724]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ben-Widawsky/drm-Plumb-modifiers-through-plane-init/20170725-062539 base: git://people.freedesktop.org/~airlied/linux.git drm-next reproduce: make htmldocs
All warnings (new ones prefixed by >>):
WARNING: convert(1) not found, for SVG to PDF conversion install ImageMagick (https://www.imagemagick.org)
arch/x86/include/asm/uaccess_32.h:1: warning: no structured comments found
include/linux/init.h:1: warning: no structured comments found
include/linux/mod_devicetable.h:687: warning: Excess struct/union/enum/typedef member 'ver_major' description in 'fsl_mc_device_id' include/linux/mod_devicetable.h:687: warning: Excess struct/union/enum/typedef member 'ver_minor' description in 'fsl_mc_device_id' kernel/sched/core.c:2088: warning: No description found for parameter 'rf'
kernel/sched/core.c:2088: warning: Excess function parameter 'cookie' description in 'try_to_wake_up_local' include/linux/kthread.h:26: warning: Excess function parameter '...' description in 'kthread_create' kernel/sys.c:1: warning: no structured comments found
include/linux/device.h:969: warning: No description found for parameter 'dma_ops' drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/linux/iio/iio.h:597: warning: No description found for parameter 'trig_readonly' include/linux/iio/trigger.h:151: warning: No description found for parameter 'indio_dev' include/linux/iio/trigger.h:151: warning: No description found for parameter 'trig' include/linux/device.h:970: warning: No description found for parameter 'dma_ops' include/linux/usb/gadget.h:230: warning: No description found for parameter 'claimed' include/linux/usb/gadget.h:230: warning: No description found for parameter 'enabled' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_altset_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_stall_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_zlp_not_supp' include/drm/drm_drv.h:537: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:537: warning: No description found for parameter 'debugfs_init' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_open_object' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_close_object' include/drm/drm_drv.h:537: warning: No description found for parameter 'prime_handle_to_fd' include/drm/drm_drv.h:537: warning: No description found for parameter 'prime_fd_to_handle' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_export' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_import' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_pin' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_unpin' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_res_obj' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_get_sg_table' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_import_sg_table' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_vmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_vunmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_mmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_vm_ops' include/drm/drm_drv.h:537: warning: No description found for parameter 'major'
include/drm/drm_drv.h:537: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:537: warning: No description found for parameter 'patchlevel' include/drm/drm_drv.h:537: warning: No description found for parameter 'name'
include/drm/drm_drv.h:537: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:537: warning: No description found for parameter 'date'
include/drm/drm_drv.h:537: warning: No description found for parameter 'driver_features' include/drm/drm_drv.h:537: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:537: warning: No description found for parameter 'num_ioctls' include/drm/drm_drv.h:537: warning: No description found for parameter 'fops'
>> include/drm/drm_plane.h:546: warning: No description found for parameter 'modifiers' >> include/drm/drm_plane.h:546: warning: No description found for parameter 'modifier_count'
include/drm/drm_color_mgmt.h:1: warning: no structured comments found
drivers/gpu/drm/drm_syncobj.c:341: warning: Excess function parameter 'dev' description in 'drm_syncobj_open' drivers/gpu/drm/drm_syncobj.c:366: warning: Excess function parameter 'dev' description in 'drm_syncobj_release' include/drm/drm_syncobj.h:1: warning: no structured comments found
drivers/gpu/drm/drm_syncobj.c:342: warning: Excess function parameter 'dev' description in 'drm_syncobj_open' drivers/gpu/drm/drm_syncobj.c:367: warning: Excess function parameter 'dev' description in 'drm_syncobj_release' drivers/gpu/host1x/bus.c:50: warning: Excess function parameter 'driver' description in 'host1x_subdev_add' Documentation/core-api/assoc_array.rst:13: WARNING: Enumerated list ends without a blank line; unexpected unindent. Documentation/doc-guide/sphinx.rst:126: ERROR: Unknown target name: "sphinx c domain".
kernel/sched/fair.c:7650: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1200: ERROR: Unexpected indentation.
kernel/time/timer.c:1202: ERROR: Unexpected indentation.
kernel/time/timer.c:1203: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:122: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:125: ERROR: Unexpected indentation.
include/linux/wait.h:127: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:990: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:322: WARNING: Inline literal start-string without end-string.
include/linux/iio/iio.h:219: ERROR: Unexpected indentation.
include/linux/iio/iio.h:220: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/iio/iio.h:226: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/iio/industrialio-core.c:638: ERROR: Unknown target name: "iio_val".
drivers/iio/industrialio-core.c:645: ERROR: Unknown target name: "iio_val".
drivers/message/fusion/mptbase.c:5051: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/tty/serial/serial_core.c:1898: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/pci/pci.c:3457: ERROR: Unexpected indentation.
include/linux/regulator/driver.h:271: ERROR: Unknown target name: "regulator_regmap_x_voltage".
include/linux/spi/spi.h:370: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:203: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:204: WARNING: Block quote ends without a blank line; unexpected unindent. drivers/gpu/drm/drm_ioctl.c:702: WARNING: Definition list ends without a blank line; unexpected unindent. Documentation/gpu/todo.rst:111: ERROR: Unknown target name: "drm_fb".
sound/soc/soc-core.c:2671: ERROR: Unknown target name: "snd_soc_daifmt".
sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn".
Documentation/userspace-api/unshare.rst:108: WARNING: Inline emphasis start-string without end-string. Documentation/usb/typec.rst:: WARNING: document isn't included in any toctree
Documentation/usb/usb3-debug-port.rst:: WARNING: document isn't included in any toctree
Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected
vim +/modifiers +546 include/drm/drm_plane.h
43968d7b Daniel Vetter 2016-09-21 @546
:::::: The code at line 546 was first introduced by commit :::::: 43968d7b806d7a7e021261294c583a216fddf0e5 drm: Extract drm_plane.[hc]
:::::: TO: Daniel Vetter <[email protected]>
:::::: CC: Sean Paul <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH 1/4] drm: Plumb modifiers through plane init
In reply to Ben Widawskyreproduce: wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross…
Hi Ben,
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v4.13-rc2 next-20170724]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ben-Widawsky/drm-Plumb-modifiers-through-plane-init/20170725-062539 base: git://people.freedesktop.org/~airlied/linux.git drm-next config: arm-sunxi_defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All error/warnings (new ones prefixed by >>):
drivers/gpu/drm/sun4i/sun8i_layer.c: In function 'sun8i_layer_init_one':
>> drivers/gpu/drm/sun4i/sun8i_layer.c:93:12: error: incompatible type for argument 7 of 'drm_universal_plane_init'
plane->type, NULL);
^~~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu/drm/sun4i/sun8i_layer.c:16:
include/drm/drm_plane.h:550:5: note: expected 'const uint64_t * {aka const long long unsigned int *}' but argument is of type 'const enum drm_plane_type'
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/uapi/linux/posix_types.h:4:0,
from include/uapi/linux/types.h:13,
from include/linux/types.h:5,
from include/linux/mod_devicetable.h:11,
from include/linux/i2c.h:29,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu/drm/sun4i/sun8i_layer.c:16:
>> include/linux/stddef.h:7:14: error: incompatible type for argument 8 of 'drm_universal_plane_init'
#define NULL ((void *)0)
^
>> drivers/gpu/drm/sun4i/sun8i_layer.c:93:25: note: in expansion of macro 'NULL'
plane->type, NULL);
^~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu/drm/sun4i/sun8i_layer.c:16:
include/drm/drm_plane.h:550:5: note: expected 'enum drm_plane_type' but argument is of type 'void *'
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/sun4i/sun8i_layer.c:90:8: error: too few arguments to function 'drm_universal_plane_init'
ret = drm_universal_plane_init(drm, &layer->plane, 0,
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu/drm/sun4i/sun8i_layer.c:16: include/drm/drm_plane.h:550:5: note: declared here
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
--
drivers/gpu//drm/sun4i/sun8i_layer.c: In function 'sun8i_layer_init_one':
drivers/gpu//drm/sun4i/sun8i_layer.c:93:12: error: incompatible type for argument 7 of 'drm_universal_plane_init'
plane->type, NULL);
^~~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu//drm/sun4i/sun8i_layer.c:16:
include/drm/drm_plane.h:550:5: note: expected 'const uint64_t * {aka const long long unsigned int *}' but argument is of type 'const enum drm_plane_type'
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/uapi/linux/posix_types.h:4:0,
from include/uapi/linux/types.h:13,
from include/linux/types.h:5,
from include/linux/mod_devicetable.h:11,
from include/linux/i2c.h:29,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu//drm/sun4i/sun8i_layer.c:16:
>> include/linux/stddef.h:7:14: error: incompatible type for argument 8 of 'drm_universal_plane_init'
#define NULL ((void *)0)
^
drivers/gpu//drm/sun4i/sun8i_layer.c:93:25: note: in expansion of macro 'NULL'
plane->type, NULL);
^~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu//drm/sun4i/sun8i_layer.c:16:
include/drm/drm_plane.h:550:5: note: expected 'enum drm_plane_type' but argument is of type 'void *'
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu//drm/sun4i/sun8i_layer.c:90:8: error: too few arguments to function 'drm_universal_plane_init'
ret = drm_universal_plane_init(drm, &layer->plane, 0,
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_crtc.h:45:0,
from include/drm/drm_atomic_helper.h:31,
from drivers/gpu//drm/sun4i/sun8i_layer.c:16: include/drm/drm_plane.h:550:5: note: declared here
int drm_universal_plane_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~
vim +/drm_universal_plane_init +93 drivers/gpu/drm/sun4i/sun8i_layer.c
9d75b8c0 Icenowy Zheng 2017-05-17 @16 #include <drm/drm_atomic_helper.h>
9d75b8c0 Icenowy Zheng 2017-05-17 17 #include <drm/drm_plane_helper.h>
9d75b8c0 Icenowy Zheng 2017-05-17 18 #include <drm/drmP.h>
9d75b8c0 Icenowy Zheng 2017-05-17 19
9d75b8c0 Icenowy Zheng 2017-05-17 20 #include "sun8i_layer.h"
9d75b8c0 Icenowy Zheng 2017-05-17 21 #include "sun8i_mixer.h"
9d75b8c0 Icenowy Zheng 2017-05-17 22
9d75b8c0 Icenowy Zheng 2017-05-17 23 struct sun8i_plane_desc {
9d75b8c0 Icenowy Zheng 2017-05-17 24 enum drm_plane_type type;
9d75b8c0 Icenowy Zheng 2017-05-17 25 const uint32_t *formats;
9d75b8c0 Icenowy Zheng 2017-05-17 26 uint32_t nformats;
9d75b8c0 Icenowy Zheng 2017-05-17 27 };
9d75b8c0 Icenowy Zheng 2017-05-17 28
9d75b8c0 Icenowy Zheng 2017-05-17 29 static void sun8i_mixer_layer_atomic_disable(struct drm_plane *plane,
9d75b8c0 Icenowy Zheng 2017-05-17 30 struct drm_plane_state *old_state)
9d75b8c0 Icenowy Zheng 2017-05-17 31 {
9d75b8c0 Icenowy Zheng 2017-05-17 32 struct sun8i_layer *layer = plane_to_sun8i_layer(plane);
9d75b8c0 Icenowy Zheng 2017-05-17 33 struct sun8i_mixer *mixer = layer->mixer;
9d75b8c0 Icenowy Zheng 2017-05-17 34
9d75b8c0 Icenowy Zheng 2017-05-17 35 sun8i_mixer_layer_enable(mixer, layer->id, false);
9d75b8c0 Icenowy Zheng 2017-05-17 36 }
9d75b8c0 Icenowy Zheng 2017-05-17 37
9d75b8c0 Icenowy Zheng 2017-05-17 38 static void sun8i_mixer_layer_atomic_update(struct drm_plane *plane,
9d75b8c0 Icenowy Zheng 2017-05-17 39 struct drm_plane_state *old_state)
9d75b8c0 Icenowy Zheng 2017-05-17 40 {
9d75b8c0 Icenowy Zheng 2017-05-17 41 struct sun8i_layer *layer = plane_to_sun8i_layer(plane);
9d75b8c0 Icenowy Zheng 2017-05-17 42 struct sun8i_mixer *mixer = layer->mixer;
9d75b8c0 Icenowy Zheng 2017-05-17 43
9d75b8c0 Icenowy Zheng 2017-05-17 44 sun8i_mixer_update_layer_coord(mixer, layer->id, plane);
9d75b8c0 Icenowy Zheng 2017-05-17 45 sun8i_mixer_update_layer_formats(mixer, layer->id, plane);
9d75b8c0 Icenowy Zheng 2017-05-17 46 sun8i_mixer_update_layer_buffer(mixer, layer->id, plane);
9d75b8c0 Icenowy Zheng 2017-05-17 47 sun8i_mixer_layer_enable(mixer, layer->id, true);
9d75b8c0 Icenowy Zheng 2017-05-17 48 }
9d75b8c0 Icenowy Zheng 2017-05-17 49
9d75b8c0 Icenowy Zheng 2017-05-17 50 static struct drm_plane_helper_funcs sun8i_mixer_layer_helper_funcs = {
9d75b8c0 Icenowy Zheng 2017-05-17 51 .atomic_disable = sun8i_mixer_layer_atomic_disable,
9d75b8c0 Icenowy Zheng 2017-05-17 52 .atomic_update = sun8i_mixer_layer_atomic_update,
9d75b8c0 Icenowy Zheng 2017-05-17 53 };
9d75b8c0 Icenowy Zheng 2017-05-17 54
9d75b8c0 Icenowy Zheng 2017-05-17 55 static const struct drm_plane_funcs sun8i_mixer_layer_funcs = {
9d75b8c0 Icenowy Zheng 2017-05-17 56 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
9d75b8c0 Icenowy Zheng 2017-05-17 57 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
9d75b8c0 Icenowy Zheng 2017-05-17 58 .destroy = drm_plane_cleanup,
9d75b8c0 Icenowy Zheng 2017-05-17 59 .disable_plane = drm_atomic_helper_disable_plane,
9d75b8c0 Icenowy Zheng 2017-05-17 60 .reset = drm_atomic_helper_plane_reset,
9d75b8c0 Icenowy Zheng 2017-05-17 61 .update_plane = drm_atomic_helper_update_plane,
9d75b8c0 Icenowy Zheng 2017-05-17 62 };
9d75b8c0 Icenowy Zheng 2017-05-17 63
9d75b8c0 Icenowy Zheng 2017-05-17 64 static const uint32_t sun8i_mixer_layer_formats[] = {
9d75b8c0 Icenowy Zheng 2017-05-17 65 DRM_FORMAT_RGB888,
9d75b8c0 Icenowy Zheng 2017-05-17 66 DRM_FORMAT_ARGB8888,
9d75b8c0 Icenowy Zheng 2017-05-17 67 DRM_FORMAT_XRGB8888,
9d75b8c0 Icenowy Zheng 2017-05-17 68 };
9d75b8c0 Icenowy Zheng 2017-05-17 69
9d75b8c0 Icenowy Zheng 2017-05-17 70 static const struct sun8i_plane_desc sun8i_mixer_planes[] = {
9d75b8c0 Icenowy Zheng 2017-05-17 71 {
9d75b8c0 Icenowy Zheng 2017-05-17 72 .type = DRM_PLANE_TYPE_PRIMARY,
9d75b8c0 Icenowy Zheng 2017-05-17 73 .formats = sun8i_mixer_layer_formats,
9d75b8c0 Icenowy Zheng 2017-05-17 74 .nformats = ARRAY_SIZE(sun8i_mixer_layer_formats),
9d75b8c0 Icenowy Zheng 2017-05-17 75 },
9d75b8c0 Icenowy Zheng 2017-05-17 76 };
9d75b8c0 Icenowy Zheng 2017-05-17 77
9d75b8c0 Icenowy Zheng 2017-05-17 78 static struct sun8i_layer *sun8i_layer_init_one(struct drm_device *drm,
9d75b8c0 Icenowy Zheng 2017-05-17 79 struct sun8i_mixer *mixer,
9d75b8c0 Icenowy Zheng 2017-05-17 80 const struct sun8i_plane_desc *plane)
9d75b8c0 Icenowy Zheng 2017-05-17 81 {
9d75b8c0 Icenowy Zheng 2017-05-17 82 struct sun8i_layer *layer;
9d75b8c0 Icenowy Zheng 2017-05-17 83 int ret;
9d75b8c0 Icenowy Zheng 2017-05-17 84
9d75b8c0 Icenowy Zheng 2017-05-17 85 layer = devm_kzalloc(drm->dev, sizeof(*layer), GFP_KERNEL);
9d75b8c0 Icenowy Zheng 2017-05-17 86 if (!layer)
9d75b8c0 Icenowy Zheng 2017-05-17 87 return ERR_PTR(-ENOMEM);
9d75b8c0 Icenowy Zheng 2017-05-17 88
9d75b8c0 Icenowy Zheng 2017-05-17 89 /* possible crtcs are set later */
9d75b8c0 Icenowy Zheng 2017-05-17 @90 ret = drm_universal_plane_init(drm, &layer->plane, 0,
9d75b8c0 Icenowy Zheng 2017-05-17 91 &sun8i_mixer_layer_funcs,
9d75b8c0 Icenowy Zheng 2017-05-17 92 plane->formats, plane->nformats,
9d75b8c0 Icenowy Zheng 2017-05-17 @93 plane->type, NULL);
9d75b8c0 Icenowy Zheng 2017-05-17 94 if (ret) {
9d75b8c0 Icenowy Zheng 2017-05-17 95 dev_err(drm->dev, "Couldn't initialize layer\n");
9d75b8c0 Icenowy Zheng 2017-05-17 96 return ERR_PTR(ret);
9d75b8c0 Icenowy Zheng 2017-05-17 97 }
9d75b8c0 Icenowy Zheng 2017-05-17 98
9d75b8c0 Icenowy Zheng 2017-05-17 99 drm_plane_helper_add(&layer->plane,
9d75b8c0 Icenowy Zheng 2017-05-17 100 &sun8i_mixer_layer_helper_funcs);
9d75b8c0 Icenowy Zheng 2017-05-17 101 layer->mixer = mixer;
9d75b8c0 Icenowy Zheng 2017-05-17 102
9d75b8c0 Icenowy Zheng 2017-05-17 103 return layer;
9d75b8c0 Icenowy Zheng 2017-05-17 104 }
9d75b8c0 Icenowy Zheng 2017-05-17 105 :::::: The code at line 93 was first introduced by commit
:::::: 9d75b8c0b999663d85cddda2791bb15b5f4a8f4a drm/sun4i: add support for Allwinner DE2 mixers
:::::: TO: Icenowy Zheng <[email protected]>
:::::: CC: Maxime Ripard <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/4 drm: Create a format/modifier blob
In reply to Ben WidawskyUpdated blob layout (Rob, Daniel, Kristian, xerpi)
v2:
* Removed __packed, and alignment (.+)
* Fix indent in drm_format_modifier fields (Liviu)
* Remove duplicated modifier > 64 check (Liviu)
* Change comment about modifier (Liviu)
* Remove arguments to blob creation, use plane instead (Liviu)
* Fix data types (Ben)
* Make the blob part of uapi (Daniel)
v3:
Remove unused ret field.
Change i, and j to unsigned int (Emil)
v4:
Use plane->modifier_count instead of recounting (Daniel)
v5:
Rename modifiers to modifiers_property (Ville) Use sizeof(__u32) instead to reflect UAPI nature (Ville) Make BUILD_BUG_ON for blob header size
--- drivers/gpu/drm/drm_mode_config.c | 7 ++++ drivers/gpu/drm/drm_plane.c | 84 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_mode_config.h | 6 +++ include/uapi/drm/drm_mode.h | 50 +++++++++++++++++++++++ 4 files changed, 147 insertions(+)
drivers/gpu/drm/drm_mode_config.c +7 -0
@@ -337,6 +337,13 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)return -ENOMEM ; dev->mode_config.gamma_lut_size_property = prop; + prop =drm_property_create (dev, +DRM_MODE_PROP_IMMUTABLE |DRM_MODE_PROP_BLOB , +"IN_FORMATS" ,0 ); +if (!prop) +return -ENOMEM ; + dev->mode_config.modifiers_property = prop; +return 0 ; }
drivers/gpu/drm/drm_plane.c +84 -0
96 lines not on this page · raw message
include/drm/drm_mode_config.h +6 -0
@@ -758,6 +758,12 @@ struct drm_mode_config {*/ bool allow_fb_modifiers; +/** +* @modifiers: Plane property to list support modifier/format +* combination. +*/ +struct drm_property *modifiers_property; +/* cursor size */ uint32_t cursor_width, cursor_height;
include/uapi/drm/drm_mode.h +50 -0
56 lines not on this page · raw message
Signature · 6 lines
2.13.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH 2/4] drm: Create a format/modifier blob
All warnings (new ones prefixed by >>):
Hi Ben,
[auto build test WARNING on drm/drm-next]
[also build test WARNING on v4.13-rc2 next-20170724]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ben-Widawsky/drm-Plumb-modifiers-through-plane-init/20170725-062539 base: git://people.freedesktop.org/~airlied/linux.git drm-next reproduce: make htmldocs
All warnings (new ones prefixed by >>):
WARNING: convert(1) not found, for SVG to PDF conversion install ImageMagick (https://www.imagemagick.org)
arch/x86/include/asm/uaccess_32.h:1: warning: no structured comments found
include/linux/init.h:1: warning: no structured comments found
include/linux/mod_devicetable.h:687: warning: Excess struct/union/enum/typedef member 'ver_major' description in 'fsl_mc_device_id' include/linux/mod_devicetable.h:687: warning: Excess struct/union/enum/typedef member 'ver_minor' description in 'fsl_mc_device_id' kernel/sched/core.c:2088: warning: No description found for parameter 'rf'
kernel/sched/core.c:2088: warning: Excess function parameter 'cookie' description in 'try_to_wake_up_local' include/linux/kthread.h:26: warning: Excess function parameter '...' description in 'kthread_create' kernel/sys.c:1: warning: no structured comments found
include/linux/device.h:969: warning: No description found for parameter 'dma_ops' drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/linux/iio/iio.h:597: warning: No description found for parameter 'trig_readonly' include/linux/iio/trigger.h:151: warning: No description found for parameter 'indio_dev' include/linux/iio/trigger.h:151: warning: No description found for parameter 'trig' include/linux/device.h:970: warning: No description found for parameter 'dma_ops' include/linux/usb/gadget.h:230: warning: No description found for parameter 'claimed' include/linux/usb/gadget.h:230: warning: No description found for parameter 'enabled' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_altset_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_stall_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_zlp_not_supp' include/drm/drm_drv.h:537: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:537: warning: No description found for parameter 'debugfs_init' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_open_object' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_close_object' include/drm/drm_drv.h:537: warning: No description found for parameter 'prime_handle_to_fd' include/drm/drm_drv.h:537: warning: No description found for parameter 'prime_fd_to_handle' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_export' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_import' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_pin' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_unpin' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_res_obj' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_get_sg_table' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_import_sg_table' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_vmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_vunmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_prime_mmap' include/drm/drm_drv.h:537: warning: No description found for parameter 'gem_vm_ops' include/drm/drm_drv.h:537: warning: No description found for parameter 'major'
include/drm/drm_drv.h:537: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:537: warning: No description found for parameter 'patchlevel' include/drm/drm_drv.h:537: warning: No description found for parameter 'name'
include/drm/drm_drv.h:537: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:537: warning: No description found for parameter 'date'
include/drm/drm_drv.h:537: warning: No description found for parameter 'driver_features' include/drm/drm_drv.h:537: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:537: warning: No description found for parameter 'num_ioctls' include/drm/drm_drv.h:537: warning: No description found for parameter 'fops'
>> include/drm/drm_mode_config.h:771: warning: No description found for parameter 'modifiers_property' >> include/drm/drm_mode_config.h:771: warning: Excess struct/union/enum/typedef member 'modifiers' description in 'drm_mode_config'
include/drm/drm_plane.h:546: warning: No description found for parameter 'modifiers'
include/drm/drm_plane.h:546: warning: No description found for parameter 'modifier_count'
include/drm/drm_color_mgmt.h:1: warning: no structured comments found
drivers/gpu/drm/drm_syncobj.c:341: warning: Excess function parameter 'dev' description in 'drm_syncobj_open' drivers/gpu/drm/drm_syncobj.c:366: warning: Excess function parameter 'dev' description in 'drm_syncobj_release' include/drm/drm_syncobj.h:1: warning: no structured comments found
drivers/gpu/drm/drm_syncobj.c:342: warning: Excess function parameter 'dev' description in 'drm_syncobj_open' drivers/gpu/drm/drm_syncobj.c:367: warning: Excess function parameter 'dev' description in 'drm_syncobj_release' drivers/gpu/host1x/bus.c:50: warning: Excess function parameter 'driver' description in 'host1x_subdev_add' Documentation/core-api/assoc_array.rst:13: WARNING: Enumerated list ends without a blank line; unexpected unindent. Documentation/doc-guide/sphinx.rst:126: ERROR: Unknown target name: "sphinx c domain".
kernel/sched/fair.c:7650: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1200: ERROR: Unexpected indentation.
kernel/time/timer.c:1202: ERROR: Unexpected indentation.
kernel/time/timer.c:1203: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:122: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:125: ERROR: Unexpected indentation.
include/linux/wait.h:127: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:990: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:322: WARNING: Inline literal start-string without end-string.
include/linux/iio/iio.h:219: ERROR: Unexpected indentation.
include/linux/iio/iio.h:220: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/iio/iio.h:226: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/iio/industrialio-core.c:638: ERROR: Unknown target name: "iio_val".
drivers/iio/industrialio-core.c:645: ERROR: Unknown target name: "iio_val".
drivers/message/fusion/mptbase.c:5051: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/tty/serial/serial_core.c:1898: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/pci/pci.c:3457: ERROR: Unexpected indentation.
include/linux/regulator/driver.h:271: ERROR: Unknown target name: "regulator_regmap_x_voltage".
include/linux/spi/spi.h:370: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:203: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:204: WARNING: Block quote ends without a blank line; unexpected unindent. drivers/gpu/drm/drm_ioctl.c:702: WARNING: Definition list ends without a blank line; unexpected unindent. Documentation/gpu/todo.rst:111: ERROR: Unknown target name: "drm_fb".
sound/soc/soc-core.c:2671: ERROR: Unknown target name: "snd_soc_daifmt".
sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn".
Documentation/userspace-api/unshare.rst:108: WARNING: Inline emphasis start-string without end-string. Documentation/usb/typec.rst:: WARNING: document isn't included in any toctree
Documentation/usb/usb3-debug-port.rst:: WARNING: document isn't included in any toctree
Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected
vim +/modifiers_property +771 include/drm/drm_mode_config.h
28575f16 Daniel Vetter 2016-11-14 @771
:::::: The code at line 771 was first introduced by commit
:::::: 28575f165d36051310d7ea2350e2011f8095b6fb drm: Extract drm_mode_config.[hc]
:::::: TO: Daniel Vetter <[email protected]>
:::::: CC: Daniel Vetter <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/4 drm/i915: Add format modifiers for Intel
In reply to Ben WidawskyThis was based on a patch originally by Kristian. It has been modified pretty heavily to use the new callbacks from the previous patch.
v2:
- Add LINEAR and Yf modifiers to list (Ville)
- Combine i8xx and i965 into one list of formats (Ville)
- Allow 1010102 formats for Y/Yf tiled (Ville)
v3:
- Handle cursor formats (Ville)
- Put handling for LINEAR in the mod_support functions (Ville)
v4:
- List each modifier explicitly in supported modifiers (Ville)
- Handle the CURSOR plane (Ville)
v5:
- Split out cursor and sprite handling (Ville)
v6:
- Actually use the sprite funcs (Emil)
- Use unreachable (Emil)
v7:
- Only allow Intel modifiers and LINEAR (Ben)
v8
- Fix spite assert introduced in v6 (Daniel)
v9
- Change vendor check logic to avoid magic 56 (Emil)
- Reorder skl_mod_support (Ville)
- make intel_plane_funcs static, could be done as of v5 (Ville)
- rename local variable intel_format_modifiers to modifiers (Ville)
- actually use sprite modifiers
- split out modifier/formats by platform (Ville)
--- drivers/gpu/drm/i915/intel_display.c | 127 +++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_sprite.c | 141 ++++++++++++++++++++++++++++++++++- 3 files changed, 259 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +122 -5
@@ -67,6 +67,12 @@ static const uint32_t i965_primary_formats[] = { DRM_FORMAT_XBGR2101010, }; +static const uint64_t i9xx_format_modifiers[] = { +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +static const uint32_t skl_primary_formats[] = {DRM_FORMAT_C8 ,DRM_FORMAT_RGB565 ,
@@ -82,11 +88,24 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, }; +static const uint64_t skl_format_modifiers[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED , +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +/* Cursor formats */ static const uint32_t intel_cursor_formats[] = {DRM_FORMAT_ARGB8888 , }; +static const uint64_t cursor_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,
@@ -12806,7 +12825,98 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } -const struct drm_plane_funcs intel_plane_funcs = { +static bool i8xx_mod_supported (uint32_t format,uint64_t modifier) +{ +switch (format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB1555 : +case DRM_FORMAT_XRGB8888 : +return modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ; +default : +return false; + } +} + +static bool i965_mod_supported (uint32_t format,uint64_t modifier) +{ +switch (format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +return modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ; +default : +return false; + } +} + +static bool skl_mod_supported (uint32_t format,uint64_t modifier) +{ +switch (format) { +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +if (modifier == I915_FORMAT_MOD_Yf_TILED) +return true; +/* fall through */ +case DRM_FORMAT_C8 : +if (modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED || + modifier ==I915_FORMAT_MOD_Y_TILED ) +return true; +/* fall through */ +default : +return false; + } +} + +static bool intel_primary_plane_format_mod_supported (struct drm_plane *plane, +uint32_t format, +uint64_t modifier) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->dev); + +if (WARN_ON (modifier ==DRM_FORMAT_MOD_INVALID )) +return false; + +if (!(modifier &DRM_FORMAT_MOD_VENDOR_INTEL ) && + modifier !=DRM_FORMAT_MOD_LINEAR ) +return false; + +if (INTEL_GEN (dev_priv) >=9 ) +return skl_mod_supported (format, modifier); +else if (INTEL_GEN (dev_priv) >=4 ) +return i965_mod_supported (format, modifier); +else +return i8xx_mod_supported (format, modifier); + +unreachable (); +} + +static bool intel_cursor_plane_format_mod_supported (struct drm_plane *plane, +uint32_t format, +uint64_t modifier) +{ +if (WARN_ON (modifier ==DRM_FORMAT_MOD_INVALID )) +return false; + +return modifier ==DRM_FORMAT_MOD_LINEAR && format ==DRM_FORMAT_ARGB8888 ; +} + +static struct drm_plane_funcs intel_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = intel_plane_destroy,
@@ -12815,6 +12925,7 @@ const struct drm_plane_funcs intel_plane_funcs = { .atomic_set_property = intel_plane_atomic_set_property, .atomic_duplicate_state = intel_plane_duplicate_state, .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_primary_plane_format_mod_supported, }; static int
@@ -12950,6 +13061,7 @@ static const struct drm_plane_funcs intel_cursor_plane_funcs = { .atomic_set_property = intel_plane_atomic_set_property, .atomic_duplicate_state = intel_plane_duplicate_state, .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_cursor_plane_format_mod_supported, }; static struct intel_plane *
@@ -12960,6 +13072,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)const uint32_t *intel_primary_formats;unsigned int supported_rotations;unsigned int num_formats; +const uint64_t *modifiers;int ret; primary =kzalloc (sizeof (*primary),GFP_KERNEL );
@@ -12998,18 +13111,21 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); + modifiers = skl_format_modifiers; primary->update_plane = skylake_update_primary_plane; primary->disable_plane = skylake_disable_primary_plane; }else if (INTEL_GEN (dev_priv) >=4 ) { intel_primary_formats = i965_primary_formats; num_formats =ARRAY_SIZE (i965_primary_formats); + modifiers = i9xx_format_modifiers; primary->update_plane = i9xx_update_primary_plane; primary->disable_plane = i9xx_disable_primary_plane; }else { intel_primary_formats = i8xx_primary_formats; num_formats =ARRAY_SIZE (i8xx_primary_formats); + modifiers = i9xx_format_modifiers; primary->update_plane = i9xx_update_primary_plane; primary->disable_plane = i9xx_disable_primary_plane;
@@ -13019,21 +13135,21 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, -NULL , + modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane 1%c" ,pipe_name (pipe)); else if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, -NULL , + modifiers,DRM_PLANE_TYPE_PRIMARY ,"primary %c" ,pipe_name (pipe)); else ret =drm_universal_plane_init (&dev_priv->drm, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats, -NULL , + modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane %c" ,plane_name (primary->plane));if (ret)
@@ -13119,7 +13235,8 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,0 , &intel_cursor_plane_funcs, intel_cursor_formats,ARRAY_SIZE (intel_cursor_formats), -NULL ,DRM_PLANE_TYPE_CURSOR , + cursor_format_modifiers, +DRM_PLANE_TYPE_CURSOR , "cursor %c", pipe_name(pipe));if (ret) goto fail;
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -1314,7 +1314,6 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, const char *name, u32 reg);void lpt_disable_pch_transcoder (struct drm_i915_private *dev_priv);void lpt_disable_iclkip (struct drm_i915_private *dev_priv); -extern const struct drm_plane_funcs intel_plane_funcs;void intel_init_display_hooks (struct drm_i915_private *dev_priv); unsigned int intel_fb_xy_to_linear(int x, int y, const struct intel_plane_state *state,
drivers/gpu/drm/i915/intel_sprite.c +137 -4
200 lines not on this page · raw message
Signature · 6 lines
2.13.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/4 drm/i915: Add support for CCS modifiers
In reply to Ben Widawskyv2:
Support sprite plane.
Support pipe C/D limitation on GEN9.
v3:
Rename structure (Ville)
Handle GLK (Ville)
This requires rebase on the correct Ville patches
--- drivers/gpu/drm/i915/intel_display.c | 30 +++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_sprite.c | 25 ++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +27 -3
@@ -88,7 +88,17 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, }; -static const uint64_t skl_format_modifiers[] = { +static const uint64_t skl_format_modifiers_noccs[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED , +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; + +static const uint64_t skl_format_modifiers_ccs[] = { + I915_FORMAT_MOD_Yf_TILED_CCS, +I915_FORMAT_MOD_Y_TILED_CCS , I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,I915_FORMAT_MOD_X_TILED ,
@@ -12862,6 +12872,10 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_ARGB8888 :case DRM_FORMAT_ABGR8888 : +if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS || + modifier ==I915_FORMAT_MOD_Y_TILED_CCS ) +return true; +/* fall through */ case DRM_FORMAT_RGB565 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 :
@@ -13108,10 +13122,20 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->frontbuffer_bit =INTEL_FRONTBUFFER_PRIMARY (pipe); primary->check_plane = intel_check_primary_plane; -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) { + intel_primary_formats = skl_primary_formats; + num_formats =ARRAY_SIZE (skl_primary_formats); + modifiers = skl_format_modifiers_ccs; + + primary->update_plane = skylake_update_primary_plane; + primary->disable_plane = skylake_disable_primary_plane; + }else if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); - modifiers = skl_format_modifiers; +if (pipe >=PIPE_C ) + modifiers = skl_format_modifiers_ccs; +else + modifiers = skl_format_modifiers_noccs; primary->update_plane = skylake_update_primary_plane; primary->disable_plane = skylake_disable_primary_plane;
drivers/gpu/drm/i915/intel_sprite.c +24 -1
@@ -1079,7 +1079,17 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, }; +static const uint64_t skl_plane_format_modifiers_noccs[] = { + I915_FORMAT_MOD_Yf_TILED, +I915_FORMAT_MOD_Y_TILED , +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +static const uint64_t skl_plane_format_modifiers[] = { + I915_FORMAT_MOD_Yf_TILED_CCS, +I915_FORMAT_MOD_Y_TILED_CCS , I915_FORMAT_MOD_Yf_TILED,I915_FORMAT_MOD_Y_TILED ,I915_FORMAT_MOD_X_TILED ,
@@ -1224,7 +1234,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, } intel_plane->base.state = &state->base; -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=10 ) { intel_plane->can_scale = true; state->scaler_id =-1 ;
@@ -1234,6 +1244,19 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, plane_formats = skl_plane_formats; num_plane_formats =ARRAY_SIZE (skl_plane_formats); modifiers = skl_plane_format_modifiers; + }else if (INTEL_GEN (dev_priv) >=9 ) { + intel_plane->can_scale = true; + state->scaler_id =-1 ; + + intel_plane->update_plane = skl_update_plane; + intel_plane->disable_plane = skl_disable_plane; + + plane_formats = skl_plane_formats; + num_plane_formats =ARRAY_SIZE (skl_plane_formats); +if (pipe >=PIPE_C ) + modifiers = skl_plane_format_modifiers_noccs; +else + modifiers = skl_plane_format_modifiers; }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { intel_plane->can_scale = false; intel_plane->max_downscale =1 ;
Signature · 6 lines
2.13.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH 4/4] drm/i915: Add support for CCS modifiers
reproduce:
Hi Ben,
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v4.13-rc2 next-20170724]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ben-Widawsky/drm-Plumb-modifiers-through-plane-init/20170725-062539 base: git://people.freedesktop.org/~airlied/linux.git drm-next config: x86_64-allyesconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/intel_display.c:105:2: error: 'I915_FORMAT_MOD_Yf_TILED_CCS' undeclared here (not in a function)
I915_FORMAT_MOD_Yf_TILED_CCS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/intel_display.c:106:2: error: 'I915_FORMAT_MOD_Y_TILED_CCS' undeclared here (not in a function)
I915_FORMAT_MOD_Y_TILED_CCS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_display.c: In function 'skl_mod_supported':
>> drivers/gpu/drm/i915/intel_display.c:13642:16: warning: comparison between pointer and integer
if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
^~
drivers/gpu/drm/i915/intel_display.c:13643:16: warning: comparison between pointer and integer
modifier == I915_FORMAT_MOD_Y_TILED_CCS)
^~
--
>> drivers/gpu/drm/i915/intel_sprite.c:1092:2: error: 'I915_FORMAT_MOD_Yf_TILED_CCS' undeclared here (not in a function)
I915_FORMAT_MOD_Yf_TILED_CCS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/intel_sprite.c:1093:2: error: 'I915_FORMAT_MOD_Y_TILED_CCS' undeclared here (not in a function)
I915_FORMAT_MOD_Y_TILED_CCS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~vim +/I915_FORMAT_MOD_Yf_TILED_CCS +105 drivers/gpu/drm/i915/intel_display.c
103
104 static const uint64_t skl_format_modifiers_ccs[] = {
> 105 I915_FORMAT_MOD_Yf_TILED_CCS, > 106 I915_FORMAT_MOD_Y_TILED_CCS,
107 I915_FORMAT_MOD_Yf_TILED,
108 I915_FORMAT_MOD_Y_TILED,
109 I915_FORMAT_MOD_X_TILED,
110 DRM_FORMAT_MOD_LINEAR,
111 DRM_FORMAT_MOD_INVALID
112 };
113
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BAT: failure for Blobifiers (FKA GET_PLANE2) (rev3)
In reply to Ben Widawsky== Series Details ==
== Series Details ==
Series: Blobifiers (FKA GET_PLANE2) (rev3)
URL : https://patchwork.freedesktop.org/series/26304/
State : failure
== Summary ==
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/intel_display.o
drivers/gpu/drm/i915/intel_display.c:100:2: error: ‘I915_FORMAT_MOD_Yf_TILED_CCS’ undeclared here (not in a function)
I915_FORMAT_MOD_Yf_TILED_CCS,
^drivers/gpu/drm/i915/intel_display.c:101:2: error: ‘I915_FORMAT_MOD_Y_TILED_CCS’ undeclared here (not in a function)
I915_FORMAT_MOD_Y_TILED_CCS,
^drivers/gpu/drm/i915/intel_display.c: In function ‘skl_mod_supported’:drivers/gpu/drm/i915/intel_display.c:12674:16: error: comparison between pointer and integer [-Werror]
if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
^
drivers/gpu/drm/i915/intel_display.c:12675:16: error: comparison between pointer and integer [-Werror]
modifier == I915_FORMAT_MOD_Y_TILED_CCS)
^cc1: all warnings being treated as errorsscripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/intel_display.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_display.o] Error 1 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 42 lines · Ben Widawsky
Second attempt (although most patches are much further along than that) and the blob property for modifiers.
This small series adds the DRM blob property that allows clients to be made aware of per plane modifiers and the formats which are supported in conjunction with those modifiers. This interface will allow clients to create buffers for scanout with a good set of modifiers, and later import those buffers (through EGL already, and Vulkan WSI later) into a graphics runtime. EGL/WSI will provide similar interfaces for rendering - modifiers which can be used for rendering.
Ben Widawsky (4):
drm: Plumb modifiers through plane init
drm: Create a format/modifier blob
drm/i915: Add format modifiers for Intel
drm/i915: Add support for CCS modifiersdrivers/gpu/drm/arc/arcpgu_crtc.c | 1 + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/armada/armada_crtc.c | 1 + drivers/gpu/drm/armada/armada_overlay.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 3 +- drivers/gpu/drm/drm_mode_config.c | 7 + drivers/gpu/drm/drm_modeset_helper.c | 1 + drivers/gpu/drm/drm_plane.c | 120 +++++++++++++++++- drivers/gpu/drm/drm_simple_kms_helper.c | 3 + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 148 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_sprite.c | 162 +++++++++++++++++++++++- drivers/gpu/drm/imx/ipuv3-plane.c | 4 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/meson/meson_plane.c | 1 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.c | 5 +- drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- drivers/gpu/drm/pl111/pl111_display.c | 2 +-
Quoted 8 lines
drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +-
for stm,
Many thanks
Philippe :-)
Quoted 7 lines
drivers/gpu/drm/sun4i/sun4i_layer.c | 2 +- drivers/gpu/drm/tegra/dc.c | 12 +- drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
Quoted 9 lines
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- include/drm/drm_mode_config.h | 6 + include/drm/drm_plane.h | 22 +++- include/drm/drm_simple_kms_helper.h | 1 + include/uapi/drm/drm_fourcc.h | 11 ++ include/uapi/drm/drm_mode.h | 50 ++++++++ 48 files changed, 576 insertions(+), 52 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx