Blobifiers (FKA GET_PLANE2)
Subsystems (37)
v4 cover Blobifiers (FKA GET_PLANE2)
These patches create the blob property for modifiers, and the implementation for i915 modifiers. This [generally] has been tested in Weston by Daniel Stone as well as an earlier version of kmscube. This patch series was formerly known as "GET_PLANE2" because the interface for obtaining the modifiers was extended throug GET_PLANE instead of a blob property.
The modifier blob (blobifier) presents a list of modifiers per plane, and a related bitmask [1] back to userspace, via KMS, so that a client such as a compositor may utilize those modifiers for buffer creation via GBM, or buffer import via dmabuf/EGL.
All vendors may optimize via their supported modifiers. For Intel, this is one of the pieces required to support end to end lossless compression (a memory bandwidth saving technique semi-common across GPUs).
I do apologize if I missed some previous review comments. A ton of things came up and it took a while to spin this rev. Nothing was missing intentionally.
[1] The bitmask is used to show the connection between which modifiers are supported by which formats.
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 | 119 +++++++++++++++++- 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 | 155 +++++++++++++++++++++++- drivers/gpu/drm/i915/intel_sprite.c | 117 +++++++++++++++++- 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 ++++++++ 47 files changed, 539 insertions(+), 49 deletions(-)
Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 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
@@ -320,6 +320,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
@@ -193,6 +193,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
@@ -213,6 +214,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;
@@ -227,6 +229,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
@@ -909,7 +909,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
@@ -14023,18 +14023,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)
@@ -14120,7 +14123,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
@@ -1176,13 +1176,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
@@ -173,7 +173,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
@@ -787,7 +787,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
@@ -1290,7 +1290,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);
@@ -1329,7 +1329,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
@@ -748,7 +748,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
@@ -439,7 +439,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;
@@ -454,7 +454,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
@@ -622,7 +622,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;
@@ -637,7 +637,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
@@ -1473,7 +1473,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;
@@ -1488,7 +1488,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.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 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)
--- drivers/gpu/drm/drm_mode_config.c | 7 ++++ drivers/gpu/drm/drm_plane.c | 83 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_mode_config.h | 6 +++ include/uapi/drm/drm_mode.h | 50 +++++++++++++++++++++++ 4 files changed, 146 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 = prop; +return 0 ; }
drivers/gpu/drm/drm_plane.c +83 -0
95 lines not on this page · raw message
include/drm/drm_mode_config.h +6 -0
@@ -757,6 +757,12 @@ struct drm_mode_config {*/ bool allow_fb_modifiers; +/** +* @modifiers: Plane property to list support modifier/format +* combination. +*/ +struct drm_property *modifiers; +/* 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.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm: Create a format/modifier blob
Quoted 69 lines · Ben Widawsky
Updated blob layout (Rob, Daniel, Kristian, xerpi)
v2:
* Removed__packed, and alignment (.+)
* Fix indent indrm_format_modifierfields (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:
Useplane->modifier_countinstead of recounting (Daniel)Cc Rob Clark <[email protected]>Cc Kristian H. Kristensen <[email protected]>Signed-off-by Ben Widawsky <[email protected]>Reviewed-by Daniel Stone <[email protected]> (v2)Reviewed-by Liviu Dudau <[email protected]> (v2)Reviewed-by Emil Velikov <[email protected]> (v3)--- drivers/gpu/drm/drm_mode_config.c | 7 ++++ drivers/gpu/drm/drm_plane.c | 83 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_mode_config.h | 6 +++ include/uapi/drm/drm_mode.h | 50 +++++++++++++++++++++++ 4 files changed, 146 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 = prop; +return 0 ; }drivers/gpu/drm/drm_plane.c +12
-0@@ -62,6 +62,86 @@ static unsigned int drm_num_planes(struct drm_device *dev)return num; } +static inline u32 * +formats_ptr (struct drm_format_modifier_blob *blob) +{ +return (u32 *)(((char *)blob) + blob->formats_offset); +} + +static inline struct drm_format_modifier * +modifiers_ptr (struct drm_format_modifier_blob *blob) +{ +return (struct drm_format_modifier *)(((char *)blob) + blob->modifiers_offset); +} +
drivers/gpu/drm/drm_plane.c static unsigned int drm_num_planes(struct drm_device *dev) · line 86
Quoted 10 lines
drivers/gpu/drm/drm_plane.c +10
-0+static int create_in_format_blob (struct drm_device *dev,struct drm_plane *plane) +{ +const struct drm_mode_config *config = &dev->mode_config; +struct drm_property_blob *blob; +struct drm_format_modifier *mod; +size_t blob_size, formats_size, modifiers_size; +struct drm_format_modifier_blob *blob_data; +unsigned int i, j; + + formats_size =sizeof (*plane->format_types) * plane->format_count;
sizeof(__u32) perhaps here since this is about the uabi, not about how we store the formats internally.
drivers/gpu/drm/drm_plane.c static unsigned int drm_num_planes(struct drm_device *dev) · line 99
Quoted 13 lines
drivers/gpu/drm/drm_plane.c +13
-0+if (WARN_ON (!formats_size)) { +/* 0 formats are never expected */ +return 0 ; + } + + modifiers_size = +sizeof (struct drm_format_modifier ) * plane->modifier_count; + + blob_size =sizeof (struct drm_format_modifier_blob ); +/* Modifiers offset is a pointer to a struct with a 64 bit field so it +* should be naturally aligned to 8B. +*/ + blob_size +=ALIGN (formats_size,8 );
Here it's ALIGN(format_size) ...
Quoted 4 lines
drivers/gpu/drm/drm_plane.c +4
-0+ blob_size += modifiers_size; + + blob =drm_property_create_blob (dev, blob_size,NULL ); +if (IS_ERR (blob))
drivers/gpu/drm/drm_plane.c static unsigned int drm_num_planes(struct drm_device *dev) · line 113
Quoted 10 lines
drivers/gpu/drm/drm_plane.c +10
-0+return -1 ; + + blob_data = (struct drm_format_modifier_blob *)blob->data; + blob_data->version =FORMAT_BLOB_CURRENT ; + blob_data->count_formats = plane->format_count; + blob_data->formats_offset =sizeof (struct drm_format_modifier_blob ); + blob_data->count_modifiers = plane->modifier_count; + + blob_data->modifiers_offset = +ALIGN (blob_data->formats_offset + formats_size,8 );
... but here it's ALIGN(formats_offset+formats_size). I think we should be aligning the same thing in both cases, or we add a BUILD_BUG_ON to make sure the header size always stays a multiple of 8 bytes.
That's mainly because the design of the structure seems geared towards expanding the header in the future (as in why else would you have the offsets?).
Quoted 49 lines
drivers/gpu/drm/drm_plane.c +34
-0+ +memcpy (formats_ptr (blob_data), plane->format_types, formats_size); + +/* If we can't determine support, just bail */ +if (!plane->funcs->format_mod_supported) + goto done; + + mod =modifiers_ptr (blob_data); +for (i =0 ; i < plane->modifier_count; i++) { +for (j =0 ; j < plane->format_count; j++) { +if (plane->funcs->format_mod_supported (plane, + plane->format_types[j], + plane->modifiers[i])) { + + mod->formats |=1 << j; + } + } + + mod->modifier = plane->modifiers[i]; + mod->offset =0 ; + mod->pad =0 ; + mod++; + } + +done: +drm_object_attach_property (&plane->base, config->modifiers, + blob->base.id); + +return 0 ; +} +/** * drm_universal_plane_init - Initialize a new universal plane object * @dev: DRM device @@ -181,6 +261,9 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,drm_object_attach_property (&plane->base, config->prop_src_h,0 ); } +if (config->allow_fb_modifiers) +create_in_format_blob (dev, plane); +return 0 ; }EXPORT_SYMBOL (drm_universal_plane_init);include/drm/drm_mode_config.h +0
-0
include/drm/drm_mode_config.h struct drm_mode_config { · line 764
Quoted 8 lines
include/drm/drm_mode_config.h +5
-0@@ -757,6 +757,12 @@ struct drm_mode_config {*/ bool allow_fb_modifiers; +/** +* @modifiers: Plane property to list support modifier/format +* combination. +*/ +struct drm_property *modifiers;
I believe that if we follow the most common naming pattern this should be "modifiers_property". Also might be good to group it next to the other properties.
Quoted 72 lines
include/drm/drm_mode_config.h +1
-0+/* cursor size */ uint32_t cursor_width, cursor_height;include/uapi/drm/drm_mode.h +50
-0@@ -712,6 +712,56 @@ struct drm_mode_atomic {__u64 user_data; }; +struct drm_format_modifier_blob { +#define FORMAT_BLOB_CURRENT 1 +/* Version of this blob format */ +u32 version; + +/* Flags */ +u32 flags; + +/* Number of fourcc formats supported */ +u32 count_formats; + +/* Where in this blob the formats exist (in bytes) */ +u32 formats_offset; + +/* Number of drm_format_modifiers */ +u32 count_modifiers; + +/* Where in this blob the modifiers exist (in bytes) */ +u32 modifiers_offset; + +/* u32 formats[] */ +/* struct drm_format_modifier modifiers[] */ +}; + +struct drm_format_modifier { +/* Bitmask of formats in get_plane format list this info applies to. The +* offset allows a sliding window of which 64 formats (bits). +* +* Some examples: +* In today's world with < 65 formats, and formats 0, and 2 are +* supported +* 0x0000000000000005 +* ^-offset = 0, formats = 5 +* +* If the number formats grew to 128, and formats 98-102 are +* supported with the modifier: +* +* 0x0000003c00000000 0000000000000000 +* ^ +* |__offset = 64, formats = 0x3c00000000 +* +*/ +__u64 formats; +__u32 offset; +__u32 pad; + +/* The modifier that applies to the >get_plane format list bitmask. */ +__u64 modifier; +}; +/** * Create a new 'blob' data property, copying length bytes from data pointer, * and returning new blob ID. Signature · 6 lines
2.13.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm: Create a format/modifier blob
On 17-06-29 22:49:44, Ville Syrjälä wrote:
[snip]
Quoted 9 lines
... but here it's
ALIGN(formats_offset+formats_size). I think we should be aligning the same thing in both cases, or we add aBUILD_BUG_ONto make sure the header size always stays a multiple of 8 bytes.That's mainly because the design of the structure seems geared towards expanding the header in the future (as in why else would you have the offsets?).
I guess I don't quite understand what you're asking for. The first thing is determining a size, the second is finding an offset into the blob.
I don't mind changing this, but tell me what you want.
BUILD_BUG_ON sounds good to me regardless.
[snip]
Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm: Create a format/modifier blob
Quoted 9 lines · Ben Widawsky
On 17-06-29 22:49:44, Ville Syrjälä wrote:
[snip]
Quoted 5 lines
... but here it's
ALIGN(formats_offset+formats_size). I think we should be aligning the same thing in both cases, or we add aBUILD_BUG_ONto make sure the header size always stays a multiple of 8 bytes.
Quoted 7 lines
Quoted 4 lines
That's mainly because the design of the structure seems geared towards expanding the header in the future (as in why else would you have the offsets?).
I guess I don't quite understand what you're asking for. The first thing is determining a size, the second is finding an offset into the blob.
If I remember my thinking correctly, then what I was trying to say was
ALIGN(multiple_of_4, 8) + ALIGN(multiple_of_4, 8) != ALIGN(multiple_of_4 + multiple_of_4, 8)
but the code was assuming that it's true, or that at least one of those things is a multiple of 8 already.
Quoted 8 lines
I don't mind changing this, but tell me what you want.
BUILD_BUG_ONsounds good to me regardless.[snip]
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm: Create a format/modifier blob
Quoted 18 lines · Ville Syrjälä
Quoted 9 lines · Ben Widawsky
On 17-06-29 22:49:44, Ville Syrjälä wrote:
[snip]
Quoted 5 lines
... but here it's
ALIGN(formats_offset+formats_size). I think we should be aligning the same thing in both cases, or we add aBUILD_BUG_ONto make sure the header size always stays a multiple of 8 bytes.Quoted 7 lines
Quoted 4 lines
That's mainly because the design of the structure seems geared towards expanding the header in the future (as in why else would you have the offsets?).
I guess I don't quite understand what you're asking for. The first thing is determining a size, the second is finding an offset into the blob.
Quoted 7 lines
If I remember my thinking correctly, then what I was trying to say was
ALIGN(multiple_of_4, 8)+ALIGN(multiple_of_4, 8)!=ALIGN(multiple_of_4 + multiple_of_4, 8)but the code was assuming that it's true, or that at least one of those things is a multiple of 8 already.
Going with this and calling it sufficient.
drivers/gpu/drm/drm_plane.c +1 -0
@@ -96,6 +96,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane/* Modifiers offset is a pointer to a struct with a 64 bit field so it * should be naturally aligned to 8B. */ +BUILD_BUG_ON (sizeof (struct drm_format_modifier_blob ) %8 ); blob_size +=ALIGN (formats_size,8 ); blob_size += modifiers_size;
Quoted 12 lines
Quoted 8 lines
I don't mind changing this, but tell me what you want.
BUILD_BUG_ONsounds good to me regardless.[snip]
--
Ben Widawsky, Intel Open Source Technology CenterSignature · 2 lines
Ville Syrjälä Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 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)
--- drivers/gpu/drm/i915/intel_display.c | 136 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 82 ++++++++++++++++++++- 2 files changed, 211 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_display.c +132 -4
@@ -72,6 +72,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 ,
@@ -87,11 +93,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,
@@ -13810,6 +13829,108 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } +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_C8 : +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +return true; +default : +return false; + } +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +/* All i915 modifiers are fine */ +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +case I915_FORMAT_MOD_Yf_TILED: +return true; +default : +return false; + } +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 >>56 ) !=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 ; +} +const struct drm_plane_funcs intel_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane,
@@ -13819,6 +13940,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
@@ -13954,6 +14076,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 *
@@ -13964,6 +14087,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 *intel_format_modifiers;int ret; primary =kzalloc (sizeof (*primary),GFP_KERNEL );
@@ -14002,18 +14126,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); + intel_format_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); + intel_format_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); + intel_format_modifiers = i9xx_format_modifiers; primary->update_plane = i9xx_update_primary_plane; primary->disable_plane = i9xx_disable_primary_plane;
@@ -14023,21 +14150,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 , + intel_format_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 , + intel_format_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 , + intel_format_modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane %c" ,plane_name (primary->plane));if (ret)
@@ -14123,7 +14250,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_sprite.c +79 -3
142 lines not on this page · raw message
Signature · 6 lines
2.13.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/4] drm/i915: Add format modifiers for Intel
Quoted 152 lines · Ben Widawsky
This 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 themod_supportfunctions (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)Cc Ville Syrjälä <[email protected]>Cc Kristian H. Kristensen <[email protected]>Cc Emil Velikov <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 136 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 82 ++++++++++++++++++++- 2 files changed, 211 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_display.c +87
-0@@ -72,6 +72,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 ,@@ -87,11 +93,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,@@ -13810,6 +13829,108 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } +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_C8 : +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +return true; +default : +return false; + } +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +/* All i915 modifiers are fine */ +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +case I915_FORMAT_MOD_Yf_TILED: +return true; +default : +return false; + } +default : +return false; + } +} +
drivers/gpu/drm/i915/intel_display.c void intel_plane_destroy(struct drm_plane *plane) · line 13909
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+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 >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&
Using ">> 56" seem a bit magical. Alternative solution is to introduce DRM_FORMAT_MOD_VENDOR_MASK or even
"if (!(modifier & DRM_FORMAT_MOD_VENDOR_INTEL) ..."
Regardless, patch looks good and is
-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/4] drm/i915: Add format modifiers for Intel
In reply to Ben WidawskyQuoted 141 lines · Ben Widawsky
This 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 themod_supportfunctions (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)Cc Ville Syrjälä <[email protected]>Cc Kristian H. Kristensen <[email protected]>Cc Emil Velikov <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 136 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_sprite.c | 82 ++++++++++++++++++++- 2 files changed, 211 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_display.c +76
-0@@ -72,6 +72,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 ,@@ -87,11 +93,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,@@ -13810,6 +13829,108 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } +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_C8 : +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +case I915_FORMAT_MOD_Y_TILED : +return true; +default : +return false; + } +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +/* All i915 modifiers are fine */ +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED :
drivers/gpu/drm/i915/intel_display.c void intel_plane_destroy(struct drm_plane *plane) · line 13898
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+case I915_FORMAT_MOD_Y_TILED : +case I915_FORMAT_MOD_Yf_TILED: +return true; +default : +return false; + } +default : +return false; + } +}
I think I might bikeshed that as
skl_mod_supported()
{
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;
}
}The CCS modifiers should then slide in very neatly after the 8888 formats.
Quoted 26 lines
drivers/gpu/drm/i915/intel_display.c +26
-0+ +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 >>56 ) !=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,
drivers/gpu/drm/i915/intel_display.c void intel_plane_destroy(struct drm_plane *plane) · line 13934
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +9
-0+ 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 ; +} + const struct drm_plane_funcs intel_plane_funcs = {
That can be made static now. And maybe rename to intel_primary_plane_funcs.
Quoted 19 lines
drivers/gpu/drm/i915/intel_display.c +2
-0.update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane,@@ -13819,6 +13940,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@@ -13954,6 +14076,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 *
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 14090
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1
-0@@ -13964,6 +14087,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 *intel_format_modifiers;
Just 'modifiers' or 'format_modifiers' seems sufficient.
Quoted 128 lines
drivers/gpu/drm/i915/intel_display.c +8
-4int ret; primary =kzalloc (sizeof (*primary),GFP_KERNEL );@@ -14002,18 +14126,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); + intel_format_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); + intel_format_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); + intel_format_modifiers = i9xx_format_modifiers; primary->update_plane = i9xx_update_primary_plane; primary->disable_plane = i9xx_disable_primary_plane;@@ -14023,21 +14150,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 , + intel_format_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 , + intel_format_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 , + intel_format_modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane %c" ,plane_name (primary->plane));if (ret)@@ -14123,7 +14250,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_sprite.c +46
-0@@ -30,6 +30,7 @@* support. */ #include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_fourcc.h> #include <drm/drm_rect.h> @@ -1043,6 +1044,12 @@ static const uint32_t g4x_plane_formats[] = { DRM_FORMAT_VYUY, }; +static const uint64_t i9xx_plane_format_modifiers[] = { +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +static const uint32_t snb_plane_formats[] = {DRM_FORMAT_XBGR8888 ,DRM_FORMAT_XRGB8888 ,@@ -1078,6 +1085,68 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, }; +static const uint64_t skl_plane_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 +}; + +static bool intel_sprite_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; + +BUG_ON (plane->type !=DRM_PLANE_TYPE_OVERLAY ); + +if ((modifier >>56 ) !=DRM_FORMAT_MOD_VENDOR_INTEL && + modifier !=DRM_FORMAT_MOD_LINEAR ) +return false; + +switch (format) { +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ABGR2101010 : +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +return true; +break ; +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +if (INTEL_GEN (dev_priv) >=9 ||IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +return true; +break ; +case DRM_FORMAT_XBGR8888 : +if (INTEL_GEN (dev_priv) >=6 ) +return true; +break ;
drivers/gpu/drm/i915/intel_sprite.c static uint32_t skl_plane_formats[] = { · line 1136
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +10
-0+case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_YUYV : +case DRM_FORMAT_YVYU : +case DRM_FORMAT_UYVY : +case DRM_FORMAT_VYUY : +return true; + } + +return false; +}
This looks quite alien compared to the primary plane code. Rather hard to parse, and it doesn't actually check the modifiers per format like the primary plane and cursor code does.
So I'd split it up into g4x,snb,vlb,skl variants just like the primary plane code does.
drivers/gpu/drm/i915/intel_sprite.c static uint32_t skl_plane_formats[] = { · line 1138
Quoted 2 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0+ +const struct drm_plane_funcs intel_sprite_plane_funcs = {
static
Quoted 58 lines
drivers/gpu/drm/i915/intel_sprite.c +16
-0+ .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .set_property = drm_atomic_helper_plane_set_property, + .atomic_get_property = intel_plane_atomic_get_property, + .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_sprite_plane_format_mod_supported, +}; +struct intel_plane *intel_sprite_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe,int plane)@@ -1086,6 +1155,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,struct intel_plane_state *state =NULL ;unsigned long possible_crtcs;const uint32_t *plane_formats; +const uint64_t *modifiers;unsigned int supported_rotations;int num_plane_formats;int ret;@@ -1112,6 +1182,7 @@ 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 (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { intel_plane->can_scale = false; intel_plane->max_downscale =1 ;@@ -1121,6 +1192,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, plane_formats = vlv_plane_formats; num_plane_formats =ARRAY_SIZE (vlv_plane_formats); + modifiers = i9xx_plane_format_modifiers; }else if (INTEL_GEN (dev_priv) >=7 ) {if (IS_IVYBRIDGE (dev_priv)) { intel_plane->can_scale = true;@@ -1135,6 +1207,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, plane_formats = snb_plane_formats; num_plane_formats =ARRAY_SIZE (snb_plane_formats); + modifiers = i9xx_plane_format_modifiers; }else { intel_plane->can_scale = true; intel_plane->max_downscale =16 ;@@ -1142,6 +1215,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, intel_plane->update_plane = g4x_update_plane; intel_plane->disable_plane = g4x_disable_plane; + modifiers = i9xx_plane_format_modifiers;if (IS_GEN6 (dev_priv)) { plane_formats = snb_plane_formats; num_plane_formats =ARRAY_SIZE (snb_plane_formats);@@ -1174,15 +1248,17 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=9 ) ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv, · line 1258
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +3
-2- possible_crtcs, &intel_plane_funcs, + possible_crtcs, &intel_sprite_plane_funcs, plane_formats, num_plane_formats, -NULL ,DRM_PLANE_TYPE_OVERLAY , + modifiers, +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,
sprite_plane_funcs
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-1plane_formats, num_plane_formats, -NULL ,DRM_PLANE_TYPE_OVERLAY , + modifiers, +DRM_PLANE_TYPE_OVERLAY , "sprite %c", sprite_name(pipe, plane));if (ret) goto fail;Signature · 1 line
2.13.1
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/4 drm/i915: Add support for CCS modifiers
In reply to Ben Widawskyv2:
Support sprite plane.
Support pipe C/D limitation on GEN9.
This requires rebase on the correct Ville patches
--- drivers/gpu/drm/i915/intel_display.c | 34 +++++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_sprite.c | 39 +++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -6
@@ -93,7 +93,17 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, }; +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[] = { + 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 ,
@@ -13872,17 +13882,13 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)return false; }case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_ABGR8888 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : -/* All i915 modifiers are fine */ +/* All non-ccs i915 modifiers are fine */ switch (modifier) {case DRM_FORMAT_MOD_LINEAR :case I915_FORMAT_MOD_X_TILED :
@@ -13892,6 +13898,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)default :return false; } +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +/* All i915 modifiers are fine */ +return true;default :return false; }
@@ -14123,13 +14135,23 @@ 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 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); intel_format_modifiers = skl_format_modifiers; 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); +if (pipe >=PIPE_C ) + intel_format_modifiers = skl_format_modifiers; +else + intel_format_modifiers = skl_format_modifiers_noccs; + + 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);
drivers/gpu/drm/i915/intel_sprite.c +38 -1
@@ -1085,7 +1085,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 ,
@@ -1108,6 +1118,20 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, modifier != DRM_FORMAT_MOD_LINEAR)return false; +switch (modifier) { +case I915_FORMAT_MOD_Yf_TILED_CCS: +case I915_FORMAT_MOD_Y_TILED_CCS : +switch (format) { +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB8888 : +return true; +default : +return false; + } + } +switch (format) {case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_ABGR2101010 :
@@ -1173,7 +1197,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 ;
@@ -1183,6 +1207,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.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 4/4] drm/i915: Add support for CCS modifiers
Quoted 21 lines · Ben Widawsky
v2:
Support sprite plane.
Support pipe C/D limitation on GEN9.This requires rebase on the correct Ville patches
Cc Daniel Stone <[email protected]>Cc Kristian Høgsberg <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 34 +++++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_sprite.c | 39 +++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -93,7 +93,17 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, };
drivers/gpu/drm/i915/intel_display.c static const uint32_t skl_primary_formats[] = { · line 104
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +8
-0+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[] = {
Maybe calls this _ccs[] then?
Quoted 43 lines
drivers/gpu/drm/i915/intel_display.c +10
-6+ 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,@@ -13872,17 +13882,13 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)return false; }case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_ABGR8888 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : -/* All i915 modifiers are fine */ +/* All non-ccs i915 modifiers are fine */ switch (modifier) {case DRM_FORMAT_MOD_LINEAR :case I915_FORMAT_MOD_X_TILED :@@ -13892,6 +13898,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)default :return false; } +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +/* All i915 modifiers are fine */ +return true;default :return false; }@@ -14123,13 +14135,23 @@ 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 ) {
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 14148
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-0intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); intel_format_modifiers = skl_format_modifiers; 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); +if (pipe >=PIPE_C )
I think I'd keep the gen10 stuff in the same branch still. Also this misses GLK. So maybe something like this:
if (GEN >= 10 || IS_GLK || pipe != PIPE_C)
Quoted 16 lines
drivers/gpu/drm/i915/intel_display.c +6
-0+ intel_format_modifiers = skl_format_modifiers; + else + intel_format_modifiers = skl_format_modifiers_noccs; + + 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);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1085,7 +1085,17 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, };
drivers/gpu/drm/i915/intel_sprite.c static uint32_t skl_plane_formats[] = { · line 1096
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +8
-0+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[] = {
Again _ccs[] maybe?
Quoted 62 lines
drivers/gpu/drm/i915/intel_sprite.c +30
-1+ 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,@@ -1108,6 +1118,20 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, modifier != DRM_FORMAT_MOD_LINEAR)return false; +switch (modifier) { +case I915_FORMAT_MOD_Yf_TILED_CCS: +case I915_FORMAT_MOD_Y_TILED_CCS : +switch (format) { +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB8888 : +return true; +default : +return false; + } + } +switch (format) {case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_ABGR2101010 :@@ -1173,7 +1197,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 ;@@ -1183,6 +1207,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.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Add support for CCS modifiers
Quoted 92 lines · Ville Syrjälä
Quoted 21 lines · Ben Widawsky
v2:
Support sprite plane.
Support pipe C/D limitation on GEN9.This requires rebase on the correct Ville patches
Cc Daniel Stone <[email protected]>Cc Kristian Høgsberg <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 34 +++++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_sprite.c | 39 +++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -93,7 +93,17 @@ static const uint32_t skl_primary_formats[] = { DRM_FORMAT_VYUY, };drivers/gpu/drm/i915/intel_display.c static const uint32_t skl_primary_formats[] = { · line 104
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +8
-0+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[] = {Maybe calls this _ccs[] then?
Quoted 43 lines
drivers/gpu/drm/i915/intel_display.c +10
-6+ 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,@@ -13872,17 +13882,13 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)return false; }case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_ABGR8888 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_YUYV :case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : -/* All i915 modifiers are fine */ +/* All non-ccs i915 modifiers are fine */ switch (modifier) {case DRM_FORMAT_MOD_LINEAR :case I915_FORMAT_MOD_X_TILED :@@ -13892,6 +13898,12 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier)default :return false; } +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +/* All i915 modifiers are fine */ +return true;default :return false; }@@ -14123,13 +14135,23 @@ 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 ) {drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 14148
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +4
-0intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); intel_format_modifiers = skl_format_modifiers; 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); +if (pipe >=PIPE_C )I think I'd keep the gen10 stuff in the same branch still. Also this misses GLK. So maybe something like this:
Quoted 2 lines
if (GEN >= 10 ||
IS_GLK|| pipe !=PIPE_C)
I'd really like to keep the pipe C limitation in the gen9 block, but yes, it was missing GLK. (Patches were originally written before GLK, I believe) Thanks for catching that.
I really suspect we're going to need to split display version out of INTEL_GEN. Maybe you guys are already doing this.
I'm fine with ccs rename, and you were right in the previous patch about how reorganizing made this diff nicer.
Quoted 87 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_display.c +6
-0+ intel_format_modifiers = skl_format_modifiers; + else + intel_format_modifiers = skl_format_modifiers_noccs; + + 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);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1085,7 +1085,17 @@ static uint32_t skl_plane_formats[] = { DRM_FORMAT_VYUY, };drivers/gpu/drm/i915/intel_sprite.c static uint32_t skl_plane_formats[] = { · line 1096
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +8
-0+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[] = {Again _ccs[] maybe?
Quoted 58 lines
drivers/gpu/drm/i915/intel_sprite.c +30
-2+ 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,@@ -1108,6 +1118,20 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, modifier != DRM_FORMAT_MOD_LINEAR)return false; +switch (modifier) { +case I915_FORMAT_MOD_Yf_TILED_CCS: +case I915_FORMAT_MOD_Y_TILED_CCS : +switch (format) { +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_XRGB8888 : +return true; +default : +return false; + } + } +switch (format) {case DRM_FORMAT_XBGR2101010 :case DRM_FORMAT_ABGR2101010 :@@ -1173,7 +1197,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 ;@@ -1183,6 +1207,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 ; --2.13.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develSignature · 2 lines
Ville Syrjälä Intel OTC
_______________________________________________
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)
In reply to Ben Widawsky== Series Details ==
== Series Details ==
Series: Blobifiers (FKA GET_PLANE2)
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: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,
^scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/intel_display.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_display.o] Error 1scripts/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:1016: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx