drm/i915: Implement .get_format_info() hook for CCS
Subsystems (38)
PATCH 1/6 drm/i915: Implement .get_format_info() hook for CCS
From: Ville Syrjälä <[email protected]>
SKL+ display engine can scan out certain kinds of compressed surfaces produced by the render engine. This involved telling the display engine the location of the color control surfae (CCS) which describes which parts of the main surface are compressed and which are not. The location of CCS is provided by userspace as just another plane with its own offset.
By providing our own format information for the CCS formats, we should be able to make framebuffer_check() do the right thing for the CCS surface as well.
Note that we'll return the same format info for both Y and Yf tiled format as that's what happens with the non-CCS Y vs. Yf as well. If desired, we could potentially return a unique pointer for each pixel_format+tiling+ccs combination, in which case we immediately be able to tell if any of that stuff changed by just comparing the pointers. But that does sound a bit wasteful space wise.
v2: Drop the 'dev' argument from the hook
v3: Include the description of the CCS surface layout
v4: Pretend CCS tiles are regular 128 byte wide Y tiles (Jason)
--- drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 37 ++++++++++++++++++++++++++++++++++++ include/drm/drm_mode_config.h | 3 ++- include/uapi/drm/drm_fourcc.h | 3 +++ 4 files changed, 43 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_fourcc.c +1 -1
@@ -222,7 +222,7 @@ drm_get_format_info(struct drm_device *dev,const struct drm_format_info *info =NULL ;if (dev->mode_config.funcs->get_format_info) - info = dev->mode_config.funcs->get_format_info (mode_cmd); + info = dev->mode_config.funcs->get_format_info (dev, mode_cmd);if (!info) info =drm_format_info (mode_cmd->pixel_format);
drivers/gpu/drm/i915/intel_display.c +37 -0
@@ -2428,6 +2428,42 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) } } +static const struct drm_format_info ccs_formats[] = { + { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_XBGR8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_ARGB8888 , .depth =32 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_ABGR8888 , .depth =32 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, +}; + +static const struct drm_format_info * +lookup_format_info (const struct drm_format_info formats[], +int num_formats,u32 format) +{ +int i; + +for (i =0 ; i < num_formats; i++) { +if (formats[i].format == format) +return &formats[i]; + } + +return NULL ; +} + +static const struct drm_format_info * +intel_get_format_info (struct drm_device *dev, +const struct drm_mode_fb_cmd2 *cmd) +{ +switch (cmd->modifier[0 ]) { +case I915_FORMAT_MOD_Y_TILED_CCS : +case I915_FORMAT_MOD_Yf_TILED_CCS: +return lookup_format_info (ccs_formats, +ARRAY_SIZE (ccs_formats), + cmd->pixel_format); +default : +return NULL ; + } +} +static int intel_fill_fb_info (struct drm_i915_private *dev_priv,struct drm_framebuffer *fb)
@@ -13675,6 +13711,7 @@ static void intel_atomic_state_free(struct drm_atomic_state *state)static const struct drm_mode_config_funcs intel_mode_funcs = { .fb_create = intel_user_framebuffer_create, + .get_format_info = intel_get_format_info, .output_poll_changed = intel_fbdev_output_poll_changed, .atomic_check = intel_atomic_check, .atomic_commit = intel_atomic_commit,
include/drm/drm_mode_config.h +2 -1
@@ -81,7 +81,8 @@ struct drm_mode_config_funcs {* The format information specific to the given fb metadata, or * NULL if none is found. */ -const struct drm_format_info *(*get_format_info)(const struct drm_mode_fb_cmd2 *mode_cmd); +const struct drm_format_info *(*get_format_info)(struct drm_device *dev, +const struct drm_mode_fb_cmd2 *mode_cmd);/** * @output_poll_changed:
include/uapi/drm/drm_fourcc.h +3 -0
@@ -252,6 +252,9 @@ extern "C" {*/ #define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3) +#define I915_FORMAT_MOD_Y_TILED_CCS fourcc_mod_code(INTEL, 4) +#define I915_FORMAT_MOD_Yf_TILED_CCS fourcc_mod_code(INTEL, 5) +/* * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks *
Signature · 6 lines
2.13.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/6 drm/i915: Add render decompression support
From: Ville Syrjälä <[email protected]>
SKL+ display engine can scan out certain kinds of compressed surfaces produced by the render engine. This involved telling the display engine the location of the color control surfae (CCS) which describes which parts of the main surface are compressed and which are not. The location of CCS is provided by userspace as just another plane with its own offset.
Add the required stuff to validate the user provided AUX plane metadata and convert the user provided linear offset into something the hardware can consume.
Due to hardware limitations we require that the main surface and the AUX surface (CCS) be part of the same bo. The hardware also makes life hard by not allowing you to provide separate x/y offsets for the main and AUX surfaces (excpet with NV12), so finding suitable offsets for both requires a bit of work. Assuming we still want keep playing tricks with the offsets. I've just gone with a dumb "search backward for suitable offsets" approach, which is far from optimal,
but it works.
Also not all planes will be capable of scanning out compressed surfaces, and eg. 90/270 degree rotation is not supported in combination with decompression either.
This patch may contain work from at least the following people:
* Vandana Kannan <[email protected]>
* Daniel Vetter <[email protected]>
* Ben Widawsky <[email protected]>
v2: Deal with display workarounds 0390, 0531, 1125 (Paulo)
v3: Pretend CCS tiles are regular 128 byte wide Y tiles (Jason)
Put the AUX register defines to the correct place Fix up the slightly bogus rotation check
v4: Use I915_WRITE_FW() due to plane update locking changes
s/return -EINVAL/goto err/ in intel_framebuffer_init()
Eliminate a bunch hardcoded numbers in CCS code
v5: (By Ben)
conflict resolution +
- res_blocks += fixed_16_16_to_u32_round_up(y_tile_minimum);
+ res_blocks += fixed16_to_u32_round_up(y_tile_minimum);
--- drivers/gpu/drm/i915/i915_reg.h | 23 ++++ drivers/gpu/drm/i915/intel_display.c | 233 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 29 ++++- drivers/gpu/drm/i915/intel_sprite.c | 5 + 4 files changed, 272 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +23 -0
@@ -6134,6 +6134,10 @@ enum {#define _PLANE_KEYMSK_2_A 0x70298#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define _PLANE_AUX_DIST_1_A 0x701c0 +#define _PLANE_AUX_DIST_2_A 0x702c0 +#define _PLANE_AUX_OFFSET_1_A 0x701c4 +#define _PLANE_AUX_OFFSET_2_A 0x702c4#define _PLANE_COLOR_CTL_1_A 0x701CC/* GLK+ */ #define _PLANE_COLOR_CTL_2_A 0x702CC/* GLK+ */ #define _PLANE_COLOR_CTL_3_A 0x703CC/* GLK+ */
@@ -6240,6 +6244,24 @@ enum {#define PLANE_NV12_BUF_CFG (pipe, plane) \ _MMIO_PLANE(plane, _PLANE_NV12_BUF_CFG_1(pipe), _PLANE_NV12_BUF_CFG_2(pipe)) +#define _PLANE_AUX_DIST_1_B 0x711c0 +#define _PLANE_AUX_DIST_2_B 0x712c0 +#define _PLANE_AUX_DIST_1 (pipe) \ + _PIPE(pipe, _PLANE_AUX_DIST_1_A, _PLANE_AUX_DIST_1_B) +#define _PLANE_AUX_DIST_2 (pipe) \ + _PIPE(pipe, _PLANE_AUX_DIST_2_A, _PLANE_AUX_DIST_2_B) +#define PLANE_AUX_DIST (pipe, plane) \ + _MMIO_PLANE(plane, _PLANE_AUX_DIST_1(pipe), _PLANE_AUX_DIST_2(pipe)) + +#define _PLANE_AUX_OFFSET_1_B 0x711c4 +#define _PLANE_AUX_OFFSET_2_B 0x712c4 +#define _PLANE_AUX_OFFSET_1 (pipe) \ + _PIPE(pipe, _PLANE_AUX_OFFSET_1_A, _PLANE_AUX_OFFSET_1_B) +#define _PLANE_AUX_OFFSET_2 (pipe) \ + _PIPE(pipe, _PLANE_AUX_OFFSET_2_A, _PLANE_AUX_OFFSET_2_B) +#define PLANE_AUX_OFFSET (pipe, plane) \ + _MMIO_PLANE(plane, _PLANE_AUX_OFFSET_1(pipe), _PLANE_AUX_OFFSET_2(pipe)) +#define _PLANE_COLOR_CTL_1_B 0x711CC#define _PLANE_COLOR_CTL_2_B 0x712CC#define _PLANE_COLOR_CTL_3_B 0x713CC
@@ -6723,6 +6745,7 @@ enum {# define CHICKEN3_DGMG_DONE_FIX_DISABLE (1 << 2)#define CHICKEN_PAR1_1 _MMIO(0x42080) +#define SKL_RC_HASH_OUTSIDE (1 << 15)#define DPA_MASK_VBLANK_SRD (1 << 15)#define FORCE_ARB_IDLE_PLANES (1 << 14)#define SKL_EDP_PSR_FIX_RDWRAP (1 << 3)
drivers/gpu/drm/i915/intel_display.c +217 -16
361 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +27 -2
@@ -62,6 +62,20 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP ); +/* +* Display WA#0390: skl,bxt,kbl,glk +* +* Must match Sampler, Pixel Back End, and Media +* (0xE194 bit 8, 0x7014 bit 13, 0x4DDC bits 27 and 31). +* +* Including bits outside the page in the hash would +* require 2 (or 4?) MiB alignment of resources. Just +* assume the defaul hashing mode which only uses bits +* within the page. +*/ +I915_WRITE (CHICKEN_PAR1_1 , +I915_READ (CHICKEN_PAR1_1 ) & ~SKL_RC_HASH_OUTSIDE ); +I915_WRITE (GEN8_CONFIG0 ,I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES );
@@ -4071,7 +4085,9 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate,/* For Non Y-tile return 8-blocks */ if (fb->modifier !=I915_FORMAT_MOD_Y_TILED && - fb->modifier != I915_FORMAT_MOD_Yf_TILED) + fb->modifier != I915_FORMAT_MOD_Yf_TILED && + fb->modifier !=I915_FORMAT_MOD_Y_TILED_CCS && + fb->modifier != I915_FORMAT_MOD_Yf_TILED_CCS)return 8 ;/*
@@ -4377,7 +4393,9 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, } y_tiled = fb->modifier ==I915_FORMAT_MOD_Y_TILED || - fb->modifier == I915_FORMAT_MOD_Yf_TILED; + fb->modifier == I915_FORMAT_MOD_Yf_TILED || + fb->modifier ==I915_FORMAT_MOD_Y_TILED_CCS || + fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS; x_tiled = fb->modifier ==I915_FORMAT_MOD_X_TILED ;/* Display WA #1141: kbl,cfl */
@@ -4472,6 +4490,13 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, res_lines =div_round_up_fixed16 (selected_result, plane_blocks_per_line); +/* Display WA #1125: skl,bxt,kbl,glk */ +if (level ==0 && + (fb->modifier ==I915_FORMAT_MOD_Y_TILED_CCS || + fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS)) + res_blocks +=fixed16_to_u32_round_up (y_tile_minimum); + +/* Display WA #1126: skl,bxt,kbl,glk */ if (level >=1 && level <=7 ) {if (y_tiled) { res_blocks +=fixed16_to_u32_round_up (y_tile_minimum);
drivers/gpu/drm/i915/intel_sprite.c +5 -0
@@ -238,6 +238,7 @@ skl_update_plane(struct intel_plane *plane,u32 surf_addr = plane_state->main.offset;unsigned int rotation = plane_state->base.rotation;u32 stride =skl_plane_stride (fb,0 , rotation); +u32 aux_stride =skl_plane_stride (fb,1 , rotation);int crtc_x = plane_state->base.dst.x1;int crtc_y = plane_state->base.dst.y1;uint32_t crtc_w =drm_rect_width (&plane_state->base.dst);
@@ -272,6 +273,10 @@ skl_update_plane(struct intel_plane *plane,I915_WRITE_FW (PLANE_OFFSET (pipe, plane_id), (y <<16 ) | x);I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride);I915_WRITE_FW (PLANE_SIZE (pipe, plane_id), (src_h <<16 ) | src_w); +I915_WRITE_FW (PLANE_AUX_DIST (pipe, plane_id), + (plane_state->aux.offset - surf_addr) | aux_stride); +I915_WRITE_FW (PLANE_AUX_OFFSET (pipe, plane_id), + (plane_state->aux.y <<16 ) | plane_state->aux.x);/* program plane scaler */ if (plane_state->scaler_id >=0 ) {
Signature · 6 lines
2.13.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/6] drm/i915: Add render decompression support
Hi,
Quoted 28 lines · Ben Widawsky
Due to hardware limitations we require that the main surface and the AUX surface (CCS) be part of the same bo. The hardware also makes life hard by not allowing you to provide separate x/y offsets for the main and AUX surfaces (excpet with NV12), so finding suitable offsets for both requires a bit of work. Assuming we still want keep playing tricks with the offsets. I've just gone with a dumb "search backward for suitable offsets" approach, which is far from optimal,
but it works.Also not all planes will be capable of scanning out compressed surfaces, and eg. 90/270 degree rotation is not supported in combination with decompression either.
This patch may contain work from at least the following people:
* Vandana Kannan <[email protected]>
* Daniel Vetter <[email protected]>
* Ben Widawsky <[email protected]>v2: Deal with display workarounds 0390, 0531, 1125 (Paulo)
v3: Pretend CCS tiles are regular 128 byte wide Y tiles (Jason)
Put the AUX register defines to the correct place Fix up the slightly bogus rotation check
v4: UseI915_WRITE_FW()due to plane update locking changes
s/return -EINVAL/goto err/ inintel_framebuffer_init()
Eliminate a bunch hardcoded numbers in CCS codev5: (By Ben)
conflict resolution +
Review
Quoted 2 lines
(quoted diff) +1
-1- res_blocks += fixed_16_16_to_u32_round_up(y_tile_minimum); + res_blocks += fixed16_to_u32_round_up(y_tile_minimum);
':set paste' is your friend :P
Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/6 drm: Plumb modifiers through plane init
In reply to Ben WidawskyThis 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)
v7: Add sun8i (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/sun4i/sun8i_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 ++++++++ 45 files changed, 131 insertions(+), 50 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
@@ -13055,18 +13055,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)
@@ -13152,7 +13155,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/sun4i/sun8i_layer.c +1 -1
@@ -90,7 +90,7 @@ static struct sun8i_layer *sun8i_layer_init_one(struct drm_device *drm, ret =drm_universal_plane_init (drm, &layer->plane,0 , &sun8i_mixer_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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/6 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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 5/6 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,
@@ -12843,7 +12862,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,
@@ -12852,6 +12962,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
@@ -12986,6 +13097,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 *
@@ -12996,6 +13108,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 );
@@ -13034,18 +13147,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;
@@ -13055,21 +13171,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)
@@ -13155,7 +13271,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
@@ -1317,7 +1317,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
Re: [PATCH 5/6] drm/i915: Add format modifiers for Intel
Hi Ben,
drivers/gpu/drm/i915/intel_display.c void intel_plane_destroy(struct drm_plane *plane) · line 12934
Quoted 12 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +12
-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 &DRM_FORMAT_MOD_VENDOR_INTEL ) && + modifier !=DRM_FORMAT_MOD_LINEAR ) +return false;
The vendor ID isn't shifted yet, so this comparison is wrong. Even if it was shifted, they're sequential rather than bitmask, so NV/QCOM/BROADCOM all match (vendor & INTEL). To fix both of these:
- if (!(modifier & DRM_FORMAT_MOD_VENDOR_INTEL) &&
- modifier != DRM_FORMAT_MOD_LINEAR)
+ if ((modifier >> 56) != DRM_FORMAT_MOD_VENDOR_INTEL &&
+ modifier != DRM_FORMAT_MOD_LINEAR)
The practical effect is that this knocked out MOD_Y_TILED and MOD_Y_TILED_CCS from the list, since they're the only two Intel modifiers without the low bit set.
Cheers,
Daniel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 6/6 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 ,
@@ -12899,6 +12909,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 :
@@ -13144,10 +13158,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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Hi Ben,
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13174
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;
Shouldn't that be (pipe < PIPE_C)?
Cheers,
Daniel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 12 lines · Daniel Stone
Hi Ben,
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13174
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;
Quoted 4 lines
Shouldn't that be (pipe <
PIPE_C)?Cheers,
Daniel
Yep. It was wrong in v7 too :/. I have it fixed locally.
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 13 lines · Ben Widawsky
Quoted 12 lines · Daniel Stone
Hi Ben,
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;
Quoted 6 lines
Quoted 4 lines
Shouldn't that be (pipe <
PIPE_C)?Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 16 lines · Daniel Vetter
Quoted 15 lines · Ben Widawsky
Quoted 14 lines · Daniel Stone
Hi Ben,
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13174
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;Shouldn't that be (pipe <
PIPE_C)?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-Daniel
I don't know whether or not IGT should have caught this, but it wouldn't have because I had been sending these without Ville's patches, so my patches alone don't even build (since his patches defined the modifiers).
Quoted 4 lines
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 22 lines · Ben Widawsky
Quoted 21 lines · Daniel Vetter
Quoted 19 lines · Ben Widawsky
Quoted 12 lines · Daniel Stone
Hi Ben,
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13174
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;Quoted 4 lines
Shouldn't that be (pipe <
PIPE_C)?Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Quoted 7 lines
Quoted 3 lines
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-DanielI don't know whether or not IGT should have caught this, but it wouldn't have because I had been sending these without Ville's patches, so my patches alone don't even build (since his patches defined the modifiers).
You can run igt testcases locally. I expect you to do that, at least for the stuff you're touching.
Does this mean there's no igts for this at all?
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 31 lines · Daniel Vetter
Quoted 22 lines · Ben Widawsky
Quoted 21 lines · Daniel Vetter
Quoted 19 lines · Ben Widawsky
Quoted 12 lines · Daniel Stone
Hi Ben,
drivers/gpu/drm/i915/intel_display.c intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) · line 13174
Quoted 8 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_display.c +5
-1+ }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;Quoted 4 lines
Shouldn't that be (pipe <
PIPE_C)?Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Quoted 7 lines
Quoted 3 lines
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-DanielI don't know whether or not IGT should have caught this, but it wouldn't have because I had been sending these without Ville's patches, so my patches alone don't even build (since his patches defined the modifiers).
Quoted 5 lines
You can run igt testcases locally. I expect you to do that, at least for the stuff you're touching.
Does this mean there's no igts for this at all?
-Daniel
I haven't been running IGT locally, so I don't know if they touch this path. We've done all testing so far with kmscube, X, and weston; then measure the overall bandwidth. In this case, I'd stop testing these since Jason/Daniel took over my other patches. I don't even know how to locally make sure I get a display on pipe C.
You could easily make an IGT make sure that you get back the right list of modifiers for a given pipe on a given GEN. Probably should do one.
Quoted 4 lines
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 51 lines · Ben Widawsky
Quoted 36 lines · Daniel Vetter
Quoted 27 lines · Ben Widawsky
Quoted 16 lines · Daniel Vetter
Quoted 15 lines · Ben Widawsky
Quoted 14 lines · Daniel Stone
Hi Ben,
Review
Quoted 8 lines · Ben Widawsky
(quoted diff) +5
-1+ } 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;Shouldn't that be (pipe <
PIPE_C)?Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-DanielQuoted 5 lines
I don't know whether or not IGT should have caught this, but it wouldn't have
because I had been sending these without Ville's patches, so my patches alone
don't even build (since his patches defined the modifiers).Quoted 5 lines
You can run igt testcases locally. I expect you to do that, at least for the stuff you're touching.
Does this mean there's no igts for this at all?
-DanielI haven't been running IGT locally, so I don't know if they touch this path. We've done all testing so far with kmscube, X, and weston; then measure the overall bandwidth. In this case, I'd stop testing these since Jason/Daniel took
over my other patches. I don't even know how to locally make sure I get a display on pipe C.
Quoted 2 lines
You could easily make an IGT make sure that you get back the right list of modifiers for a given pipe on a given GEN. Probably should do one.
That's not a terribly interesting testcase (we have none of this kind I think). But I thought there was a CCS igt that created some simple compressed buffers and tried to display them, and then checked it all looked good using crcs, i.e. an actual functional testcase, and that should have caught the mislisten on pipe C (if it bothered to test all planes that expose the CCS modifier). Iirc Ville had that. We do need that for merging the kernel side.
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
Quoted 63 lines · Daniel Vetter
Quoted 51 lines · Ben Widawsky
Quoted 36 lines · Daniel Vetter
Quoted 27 lines · Ben Widawsky
Quoted 16 lines · Daniel Vetter
Quoted 15 lines · Ben Widawsky
Quoted 14 lines · Daniel Stone
Hi Ben,
Review
Quoted 8 lines · Ben Widawsky
(quoted diff) +5
-1+ } 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;Shouldn't that be (pipe <
PIPE_C)?Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Cheers,
DanielYep. It was wrong in v7 too :/. I have it fixed locally.
Shouldn't the igt catch this, or does it not try to exercise all the plane/crtc combos there are?
-DanielQuoted 5 lines
I don't know whether or not IGT should have caught this, but it wouldn't have
because I had been sending these without Ville's patches, so my patches alone
don't even build (since his patches defined the modifiers).Quoted 5 lines
You can run igt testcases locally. I expect you to do that, at least for the stuff you're touching.
Does this mean there's no igts for this at all?
-DanielI haven't been running IGT locally, so I don't know if they touch this path. We've done all testing so far with kmscube, X, and weston; then measure the overall bandwidth. In this case, I'd stop testing these since Jason/Daniel took
over my other patches. I don't even know how to locally make sure I get a display on pipe C.Quoted 2 lines
You could easily make an IGT make sure that you get back the right list of modifiers for a given pipe on a given GEN. Probably should do one.
That's not a terribly interesting testcase (we have none of this kind I think). But I thought there was a CCS igt that created some simple compressed buffers and tried to display them, and then checked it all looked good using crcs, i.e. an actual functional testcase, and that should have caught the mislisten on pipe C (if it bothered to test all planes that expose the CCS modifier). Iirc Ville had that. We do need that for merging the kernel side.
Quoted 1 line
Thanks, Daniel
Yeah, we did have that already - just nothing for blobifiers specifically. It sounds like igt_ccs is broken at the moment.
Quoted 4 lines
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915: Add support for CCS modifiers
In reply to Ben WidawskyHi,
Quoted 4 lines · Ben Widawsky
drivers/gpu/drm/i915/intel_sprite.c +4
-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 ,
drivers/gpu/drm/i915/intel_sprite.c static uint32_t skl_plane_formats[] = { · line 1095
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +6
-0+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,
This is also missing the relevant hunk in format_mod_supported.
Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +3
-0@@ -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 ;
drivers/gpu/drm/i915/intel_sprite.c intel_sprite_plane_create(struct drm_i915_private *dev_priv, · line 1259
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +10
-0+ + 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;
This explains the inconsistency.
Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/6] drm/i915: Implement .get_format_info() hook for CCS
In reply to Ben Widawsky== Series Details ==
== Series Details ==
Series: series starting with [1/6] drm/i915: Implement .get_format_info() hook for CCS
URL : https://patchwork.freedesktop.org/series/27949/
State : failure
== Summary ==
Series 27949v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/27949/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215
Test kms_frontbuffer_tracking:
Subgroup basic:
pass -> FAIL (fi-glk-2a)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
dmesg-warn -> PASS (fi-pnv-d510) fdo#101597
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-j1900) fdo#101705fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:456s fi-bdw-gvtdvm total:280 pass:266 dwarn:0 dfail:0 fail:0 skip:14 time:434s fi-blb-e6850 total:280 pass:225 dwarn:1 dfail:0 fail:0 skip:54 time:358s fi-bsw-n3050 total:280 pass:244 dwarn:0 dfail:0 fail:0 skip:36 time:536s fi-bxt-j4205 total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:512s fi-byt-j1900 total:280 pass:255 dwarn:1 dfail:0 fail:0 skip:24 time:497s fi-byt-n2820 total:280 pass:251 dwarn:1 dfail:0 fail:0 skip:28 time:487s fi-glk-2a total:280 pass:260 dwarn:0 dfail:0 fail:1 skip:19 time:593s fi-hsw-4770 total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:438s fi-hsw-4770r total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:417s fi-ilk-650 total:280 pass:230 dwarn:0 dfail:0 fail:0 skip:50 time:416s fi-ivb-3520m total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:501s fi-ivb-3770 total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:472s fi-kbl-7500u total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:469s fi-kbl-7560u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:574s fi-kbl-r total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:595s fi-pnv-d510 total:280 pass:223 dwarn:2 dfail:0 fail:0 skip:55 time:572s fi-skl-6260u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:459s fi-skl-6700hq total:280 pass:263 dwarn:0 dfail:0 fail:0 skip:17 time:587s fi-skl-6700k total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:471s fi-skl-6770hq total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:478s fi-skl-gvtdvm total:280 pass:267 dwarn:0 dfail:0 fail:0 skip:13 time:438s fi-skl-x1585l total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:494s fi-snb-2520m total:280 pass:252 dwarn:0 dfail:0 fail:0 skip:28 time:543s fi-snb-2600 total:280 pass:250 dwarn:0 dfail:0 fail:1 skip:29 time:410s
a74cf664628ae105b471052d6cefb2ef23f89aae drm-tip: 2017y-07m-26d-16h-40m-02s UTC integration manifest 7e4c3147c3d9 drm/i915: Add support for CCS modifiers1696112cd252 drm/i915: Add format modifiers for Intela79499681ae3 drm: Create a format/modifier blobd617c955eab1 drm: Plumb modifiers through plane init8a83b9cba9e9 drm/i915: Add render decompression support6635d22090bb drm/i915: Implement .get_format_info() hook for CCS
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5284/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Ben,
Quoted 2 lines · Ben Widawsky
v2: Drop the 'dev' argument from the hook
v3: Include the description of the CCS surface layout
This went missing. Vidya's patch has it though.
drivers/gpu/drm/i915/intel_display.c static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) · line 2435
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5
-0+static const struct drm_format_info ccs_formats[] = { + { .format =DRM_FORMAT_XRGB8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_XBGR8888 , .depth =24 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_ARGB8888 , .depth =32 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , }, + { .format =DRM_FORMAT_ABGR8888 , .depth =32 , .num_planes =2 , .cpp = {4 ,1 , }, .hsub =16 , .vsub =8 , },
Mind you, this is backwards from Vidya's patch, in which CCS is described as 8x16 subsampled rather than 16x8. I think yours is correct though.
Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx