Adding NV12 support for SKL display
Subsystems (3)
cover Adding NV12 support for SKL display
This patch series is adding NV12 support for Skylake display after rebasing on latest drm-intel-nightly. Initial series of the patches can be found here:
https://lists.freedesktop.org/archives/intel-gfx/2015-May/066786.html
Feature has been currently tested with custom linux based test tool IGT test development is under progress. Floating these patches for initial review. These NV12 patches are dependent on Ville's patches mentioned below.
Update from last rev:
Patches were initial reviewed last when floated but currently there was a design change with respect to
- the way fb offset is handled
- the way rotation is handled
Rebase of the current NV12 patch series has been done as per the current changes on drm-intel-nightly.
Review comments from Ville (12th June 2017) have been addressed Review comments from Clinton A Taylor (7th July 2017) have been addressed
Review comments from Clinton A Taylor (10th July 2017) have been addressed. Had missed out tested-by/reviewed-by in the patches. Fixed that error in this series.
Chandra Konduru (6):
drm/i915: Set scaler mode for NV12
drm/i915: Update format_is_yuv() to include NV12 drm/i915: Upscale scaler max scale for NV12 drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane drm/i915: Add NV12 support to intel_framebuffer_init
Ville Syrjälä (2):
drm/i915: Implement .get_format_info() hook for CCS drm/i915: Add render decompression support
drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 24 +++ drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 313 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 29 +++- drivers/gpu/drm/i915/intel_sprite.c | 16 +- include/drm/drm_mode_config.h | 3 +- include/uapi/drm/drm_fourcc.h | 3 + 9 files changed, 365 insertions(+), 36 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/8 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 @@ const struct drm_format_info *drm_format_info(u32 format)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
@@ -2433,6 +2433,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)
@@ -14622,6 +14658,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 @@*/ #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
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915: Add render decompression support
In reply to Vidya SrinivasFrom: 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
--- drivers/gpu/drm/i915/i915_reg.h | 23 ++++ drivers/gpu/drm/i915/intel_display.c | 241 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 29 ++++- drivers/gpu/drm/i915/intel_sprite.c | 5 + 4 files changed, 279 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +23 -0
@@ -6106,6 +6106,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+ */
@@ -6212,6 +6216,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
@@ -6695,6 +6717,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 +224 -17
384 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 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,/* 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 */
@@ -4476,6 +4494,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 +=fixed_16_16_to_u32_round_up (y_tile_minimum); + +/* Display WA #1126: skl,bxt,kbl,glk */ if (level >=1 && level <=7 ) {if (y_tiled) { res_blocks +=fixed_16_16_to_u32_round_up (y_tile_minimum);
drivers/gpu/drm/i915/intel_sprite.c +5 -0
@@ -244,6 +244,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *worku32 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);
@@ -278,6 +279,10 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workI915_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
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 drm/i915: Set scaler mode for NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch sets appropriate scaler mode for NV12 format. In this mode, skylake scaler does either chroma-upsampling or chroma-upsampling and resolution scaling
v2: Review comments from Ville addressed
NV12 case to be checked first for setting the scaler
v3: Rebased (me)
v4: Rebased (me)
v5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_atomic.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -6390,6 +6390,7 @@ enum {#define PS_SCALER_MODE_MASK (3 << 28)#define PS_SCALER_MODE_DYN (0 << 28)#define PS_SCALER_MODE_HQ (1 << 28) +#define PS_SCALER_MODE_NV12 (2 << 28)#define PS_PLANE_SEL_MASK (7 << 25)#define PS_PLANE_SEL (plane) (((plane) + 1) << 25)#define PS_FILTER_MASK (3 << 23)
drivers/gpu/drm/i915/intel_atomic.c +7 -1
@@ -325,7 +325,13 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, }/* set scaler mode */ -if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (plane_state && plane_state->base.fb && + plane_state->base.fb->format->format == +DRM_FORMAT_NV12 ) { +DRM_ERROR ("NV12 format setting scaler mode\n" ); + scaler_state->scalers[*scaler_id].mode = +PS_SCALER_MODE_NV12 ; + }else if (IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { scaler_state->scalers[*scaler_id].mode =0 ; }else if (num_scalers_need ==1 && intel_crtc->pipe !=PIPE_C ) {/*
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 drm/i915: Update format_is_yuv() to include NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to format_is_yuv() function
for sprite planes.
v2:
-Use intel_ prefix for format_is_yuv (Ville)
v3: Rebased (me)
v4: Rebased and addressed review comments from Clinton A Taylor.
"static function in intel_sprite.c is not available to the primary plane functions".
Changed commit message - function modified for sprite planes.
v5: Missed the Tested-by/Reviewed-by in the previous series Adding the same to commit message in this version.
--- drivers/gpu/drm/i915/intel_sprite.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +4 -3
@@ -41,13 +41,14 @@#include "i915_drv.h" static bool -format_is_yuv (uint32_t format) +intel_format_is_yuv (uint32_t format) {switch (format) {case DRM_FORMAT_YUYV :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY :case DRM_FORMAT_YVYU : +case DRM_FORMAT_NV12 :return true;default :return false;
@@ -336,7 +337,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workenum plane_id plane_id = plane->id;/* Seems RGB data bypasses the CSC always */ -if (!format_is_yuv (format)) +if (!intel_format_is_yuv (format))return ;/*
@@ -900,7 +901,7 @@ static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state, src_y = src->y1 >>16 ; src_h =drm_rect_height (src) >>16 ; -if (format_is_yuv (fb->format->format)) { +if (intel_format_is_yuv (fb->format->format)) { src_x &= ~1 ; src_w &= ~1 ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 drm/i915: Upscale scaler max scale for NV12
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch updates scaler max limit support for NV12
v2: Rebased (me)
v3: Rebased (me)
v4: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.
--- drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 3 files changed, 24 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +20 -8
@@ -3438,6 +3438,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_UYVY ;case DRM_FORMAT_VYUY :return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ; +case DRM_FORMAT_NV12 : +return PLANE_CTL_FORMAT_NV12 ;default :MISSING_CASE (pixel_format); }
@@ -4801,7 +4803,8 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)static int skl_update_scaler (struct intel_crtc_state *crtc_state,bool force_detach,unsigned int scaler_user,int *scaler_id, -int src_w,int src_h,int dst_w,int dst_h) +int src_w,int src_h,int dst_w,int dst_h, +uint32_t pixel_format) {struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;
@@ -4817,7 +4820,8 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)* the 90/270 degree plane rotation cases (to match the * GTT mapping), hence no need to account for rotation here. */ - need_scaling = src_w != dst_w || src_h != dst_h; + need_scaling = src_w != dst_w || src_h != dst_h || + (pixel_format ==DRM_FORMAT_NV12 );/* * Scaling/fitting not supported in IF-ID mode in GEN9+
@@ -4893,7 +4897,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)return skl_update_scaler (state, !state->base.active,SKL_CRTC_INDEX , &state->scaler_state.scaler_id, state->pipe_src_w, state->pipe_src_h, - adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay); + adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay,0 ); }/**
@@ -4923,7 +4927,8 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,drm_rect_width (&plane_state->base.src) >>16 ,drm_rect_height (&plane_state->base.src) >>16 ,drm_rect_width (&plane_state->base.dst), - drm_rect_height(&plane_state->base.dst)); +drm_rect_height (&plane_state->base.dst), + fb ? fb->format->format : 0);if (ret || plane_state->scaler_id <0 )return ret;
@@ -4949,6 +4954,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
@@ -13656,7 +13662,8 @@ static int intel_atomic_commit(struct drm_device *dev, }int -skl_max_scale (struct intel_crtc *intel_crtc,struct intel_crtc_state *crtc_state) +skl_max_scale (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,uint32_t pixel_format) {struct drm_i915_private *dev_priv;int max_scale;
@@ -13682,8 +13689,9 @@ static int intel_atomic_commit(struct drm_device *dev,* or * cdclk/crtc_clock */ - max_scale =min ((1 <<16 ) *3 -1 , - (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock)); + max_scale =min ((1 <<16 ) * + (pixel_format ==DRM_FORMAT_NV12 ?2 :3 ) -1 , + (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock));return max_scale; }
@@ -13704,7 +13712,11 @@ static int intel_atomic_commit(struct drm_device *dev,/* use scaler when colorkey is not required */ if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { min_scale =1 ; - max_scale =skl_max_scale (to_intel_crtc (crtc), crtc_state); + max_scale =skl_max_scale (to_intel_crtc (crtc), + crtc_state, + state->base.fb ? + state->base.fb->format->format : +0 ); } can_position = true; }
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1480,7 +1480,8 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, struct intel_crtc_state *pipe_config);int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state); -int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); +int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, +uint32_t pixel_format);static inline u32 intel_plane_ggtt_offset (const struct intel_plane_state *state) {
drivers/gpu/drm/i915/intel_sprite.c +2 -1
@@ -823,7 +823,8 @@ static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { can_scale =1 ; min_scale =1 ; - max_scale =skl_max_scale (crtc, crtc_state); + max_scale =skl_max_scale (crtc, crtc_state, + fb->format->format); }else { can_scale =0 ; min_scale =DRM_PLANE_HELPER_NO_SCALING ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/8] drm/i915: Upscale scaler max scale for NV12
Quoted 46 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch updates scaler max limit support for NV12
v2: Rebased (me)
v3: Rebased (me)
v4: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 3 files changed, 24 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-1@@ -3438,6 +3438,8 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_UYVY ;case DRM_FORMAT_VYUY :return PLANE_CTL_FORMAT_YUV422 |PLANE_CTL_YUV422_VYUY ; +case DRM_FORMAT_NV12 : +return PLANE_CTL_FORMAT_NV12 ;default :MISSING_CASE (pixel_format); }@@ -4801,7 +4803,8 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)static int skl_update_scaler (struct intel_crtc_state *crtc_state,bool force_detach,unsigned int scaler_user,int *scaler_id, -int src_w,int src_h,int dst_w,int dst_h) +int src_w,int src_h,int dst_w,int dst_h, +uint32_t pixel_format) {struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;
drivers/gpu/drm/i915/intel_display.c static void cpt_verify_modeset(struct drm_device *dev, int pipe) · line 4824
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-1@@ -4817,7 +4820,8 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe)* the 90/270 degree plane rotation cases (to match the * GTT mapping), hence no need to account for rotation here. */ - need_scaling = src_w != dst_w || src_h != dst_h; + need_scaling = src_w != dst_w || src_h != dst_h || + (pixel_format ==DRM_FORMAT_NV12 );
Indentation is still messed in many places in the series.
Quoted 41 lines
drivers/gpu/drm/i915/intel_display.c +6
-3/* * Scaling/fitting not supported in IF-ID mode in GEN9+ @@ -4893,7 +4897,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state)return skl_update_scaler (state, !state->base.active,SKL_CRTC_INDEX , &state->scaler_state.scaler_id, state->pipe_src_w, state->pipe_src_h, - adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay); + adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay,0 ); }/** @@ -4923,7 +4927,8 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,drm_rect_width (&plane_state->base.src) >>16 ,drm_rect_height (&plane_state->base.src) >>16 ,drm_rect_width (&plane_state->base.dst), - drm_rect_height(&plane_state->base.dst)); +drm_rect_height (&plane_state->base.dst), + fb ? fb->format->format : 0);if (ret || plane_state->scaler_id <0 )return ret;@@ -4949,6 +4954,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,case DRM_FORMAT_YVYU :case DRM_FORMAT_UYVY :case DRM_FORMAT_VYUY : +case DRM_FORMAT_NV12 :break ;default : DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",@@ -13656,7 +13662,8 @@ static int intel_atomic_commit(struct drm_device *dev, }int -skl_max_scale (struct intel_crtc *intel_crtc,struct intel_crtc_state *crtc_state) +skl_max_scale (struct intel_crtc *intel_crtc, +struct intel_crtc_state *crtc_state,uint32_t pixel_format) {struct drm_i915_private *dev_priv;int max_scale;
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_commit(struct drm_device *dev, · line 13694
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +3
-2@@ -13682,8 +13689,9 @@ static int intel_atomic_commit(struct drm_device *dev,* or * cdclk/crtc_clock */ - max_scale =min ((1 <<16 ) *3 -1 , - (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock)); + max_scale =min ((1 <<16 ) * + (pixel_format ==DRM_FORMAT_NV12 ?2 :3 ) -1 , + (1 <<8 ) * ((max_dotclk <<8 ) / crtc_clock));
IIRC I already suggested to make this less convoluted by splitting it up a bit.
Quoted 51 lines
drivers/gpu/drm/i915/intel_display.c +5
-1return max_scale; }@@ -13704,7 +13712,11 @@ static int intel_atomic_commit(struct drm_device *dev,/* use scaler when colorkey is not required */ if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { min_scale =1 ; - max_scale =skl_max_scale (to_intel_crtc (crtc), crtc_state); + max_scale =skl_max_scale (to_intel_crtc (crtc), + crtc_state, + state->base.fb ? + state->base.fb->format->format : +0 ); } can_position = true; }drivers/gpu/drm/i915/intel_drv.h +2
-1@@ -1480,7 +1480,8 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, struct intel_crtc_state *pipe_config);int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state); -int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); +int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, +uint32_t pixel_format);static inline u32 intel_plane_ggtt_offset (const struct intel_plane_state *state) {drivers/gpu/drm/i915/intel_sprite.c +2
-1@@ -823,7 +823,8 @@ static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state,if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { can_scale =1 ; min_scale =1 ; - max_scale =skl_max_scale (crtc, crtc_state); + max_scale =skl_max_scale (crtc, crtc_state, + fb->format->format); }else { can_scale =0 ; min_scale =DRM_PLANE_HELPER_NO_SCALING ;Signature · 6 lines
1.9.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
PATCH 6/8 drm/i915: Add NV12 as supported format for primary plane
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for primary plane
v2: Rebased (Chandra Konduru)
v3: Rebased (me)
v4: Review comments by Ville addressed
Removed the skl_primary_formats_with_nv12 and added NV12 case in existing skl_primary_formats
v5: Rebased (me)
v6: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -85,6 +85,7 @@ static bool is_mmio_work(struct intel_flip_work *work)DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, };/* Cursor formats */
@@ -13999,7 +14000,6 @@ void intel_plane_destroy(struct drm_plane *plane)if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); - primary->update_plane = skylake_update_primary_plane; primary->disable_plane = skylake_disable_primary_plane; }else if (INTEL_GEN (dev_priv) >=4 ) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/8] drm/i915: Add NV12 as supported format for primary plane
Quoted 32 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for primary plane
v2: Rebased (Chandra Konduru)
v3: Rebased (me)
v4: Review comments by Ville addressed
Removed theskl_primary_formats_with_nv12and added NV12 case in existingskl_primary_formatsv5: Rebased (me)
v6: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version.Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static bool is_mmio_work(struct intel_flip_work *work) · line 88
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1
-0@@ -85,6 +85,7 @@ static bool is_mmio_work(struct intel_flip_work *work)DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12,
This has the same issues as the sprite patch.
Quoted 18 lines
drivers/gpu/drm/i915/intel_display.c +0
-1};/* Cursor formats */ @@ -13999,7 +14000,6 @@ void intel_plane_destroy(struct drm_plane *plane)if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats); - primary->update_plane = skylake_update_primary_plane; primary->disable_plane = skylake_disable_primary_plane; }else if (INTEL_GEN (dev_priv) >=4 ) {Signature · 6 lines
1.9.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
PATCH 7/8 drm/i915: Add NV12 as supported format for sprite plane
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
v3: Review comments by Ville addressed
- Removed skl_plane_formats_with_nv12 and added NV12 case in existing skl_plane_formats
- Added the 10bpc RGB formats
v4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 series
v5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.
--- drivers/gpu/drm/i915/intel_sprite.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_sprite.c +1 -0
@@ -1078,6 +1078,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, }; struct intel_plane *
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915: Add NV12 as supported format for sprite plane
Quoted 28 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
v3: Review comments by Ville addressed
- Removedskl_plane_formats_with_nv12and added NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 seriesv5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.
Quoted 2 lines
Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>
I had not actually given the reviewed-by for patch 7/8 yet. Make sure that you only add the reviewed-by to the commit message for patches that have been marked that way by the reviewers.
Of course now the patch looks good and we can leave the RB in the commit message.
Thanks for getting this done,
-Clint
Quoted 12 lines
Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_sprite.c +0
-0
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device *dev, void *data, · line 1084
Quoted 7 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -1078,6 +1078,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, }; struct intel_plane *
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915: Add NV12 as supported format for sprite plane
In reply to Vidya SrinivasQuoted 42 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
v3: Review comments by Ville addressed
- Removedskl_plane_formats_with_nv12and added NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 seriesv5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 series patches? Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_sprite.c +0
-0
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device *dev, void *data, · line 1082
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -1078,6 +1078,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, };
That's not correct for pipe C sprites on SKL/KBL/BXT.
Also like I mentioned earlier at least SKL shouldn't be advertizing NV12 at all. IIRC you were going to find out what the situation is with the other platforms.
Quoted 9 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0struct intel_plane *Signature · 6 lines
1.9.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 7/8] drm/i915: Add NV12 as supported format for sprite plane
Quoted 65 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, July 11, 2017 9:42 PM
To: Srinivas, Vidya <[email protected]>
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 7/8] drm/i915: Add NV12 as supported format for sprite planeQuoted 6 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
Quoted 7 lines
v3: Review comments by Ville addressed
- Removedskl_plane_formats_with_nv12and added NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 seriespatches?
Quoted 8 lines
Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 seriesv5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor "Why are we adding 10 bit RGB formats with the NV12 seriespatches?
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device
Quoted 22 lines
Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1078,6 +1078,7 @@ int intel_sprite_set_colorkey(struct drm_device*dev, void *data,
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device *dev, void *data, · line 1082
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, };That's not correct for pipe C sprites on SKL/KBL/BXT.
Quoted 3 lines
Also like I mentioned earlier at least SKL shouldn't be advertizing NV12 at all. IIRC you were going to find out what the situation is with the other platforms.
Apologies for the delay. I shall find this and fix before sending the next series with other review comments addressed.
Regards
Vidya
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-1struct intel_plane * --1.9.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915: Add NV12 as supported format for sprite plane
In reply to Ville SyrjäläQuoted 65 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, July 11, 2017 9:42 PM
To: Srinivas, Vidya <[email protected]>
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 7/8] drm/i915: Add NV12 as supported format for sprite planeQuoted 6 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 to list of supported formats for sprite plane.
v2: Rebased (me)
Quoted 7 lines
v3: Review comments by Ville addressed
- Removedskl_plane_formats_with_nv12and added NV12 case in existingskl_plane_formats
- Added the 10bpc RGB formatsv4: Addressed review comments from Clinton A Taylor
"Why are we adding 10 bit RGB formats with the NV12 seriespatches?
Quoted 8 lines
Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Removed 10bit RGB formats added previously with NV12 seriesv5: Missed the Tested-by/Reviewed-by in the previous series
Adding the same to commit message in this version. Addressed review comments from Clinton A Taylor "Why are we adding 10 bit RGB formats with the NV12 seriespatches?
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device
Quoted 22 lines
Trying to set XR30 or AB30 results in error returned even though the modes are advertised for the planes"
- Previous version has 10bit RGB format removed from VLV formats by mistake. Fixing that in this version.
Removed 10bit RGB formats added previously with NV12 series for SKL.Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -1078,6 +1078,7 @@ int intel_sprite_set_colorkey(struct drm_device*dev, void *data,
drivers/gpu/drm/i915/intel_sprite.c int intel_sprite_set_colorkey(struct drm_device *dev, void *data, · line 1082
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY , + DRM_FORMAT_NV12, };That's not correct for pipe C sprites on SKL/KBL/BXT.
Quoted 4 lines
Also like I mentioned earlier at least SKL shouldn't be advertizing NV12 at all. IIRC you were going to find out what the situation is with the other platforms.
I checked for the platform support we need.
For now, we wanted to enable it on Apollo Lake platforms (BXT).I have changed the patch and addressed the review comments. Kindly have a check. Thank you.
Regards
Vidya
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-1struct intel_plane * --1.9.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 drm/i915: Add NV12 support to intel_framebuffer_init
In reply to Vidya SrinivasFrom: Chandra Konduru <[email protected]>
This patch adds NV12 as supported format
to intel_framebuffer_init and performs various checks.
v2:
-Fix an issue in checks added (Chandra Konduru)
v3: rebased (me)
v4: Review comments by Ville addressed
Added platform check for NV12 in intel_framebuffer_init Removed offset checks for NV12 case
v5: Addressed review comments by Clinton A Taylor
This NV12 support only correctly works on SKL.
Plane color space conversion is different on GLK and later platforms causing the colors to display incorrectly.
Ville's plane color space property patch series
in review will fix this issue.
- Restricted the NV12 case in intel_framebuffer_init to SKL and BXT only.
v6: Rebased (me)
--- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_display.c +5 -0
@@ -14780,6 +14780,11 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (INTEL_GEN (dev_priv) >=9 ) +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +break ; + goto err;default :DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 8/8] drm/i915: Add NV12 support to intel_framebuffer_init
Quoted 39 lines · Vidya Srinivas
From: Chandra Konduru <[email protected]>
This patch adds NV12 as supported format
tointel_framebuffer_initand performs various checks.v2:
-Fix an issue in checks added (Chandra Konduru)v3: rebased (me)
v4: Review comments by Ville addressed
Added platform check for NV12 inintel_framebuffer_initRemoved offset checks for NV12 casev5: Addressed review comments by Clinton A Taylor
This NV12 support only correctly works on SKL.
Plane color space conversion is different on GLK and later platforms causing the colors to display incorrectly.
Ville's plane color space property patch series
in review will fix this issue.
- Restricted the NV12 case inintel_framebuffer_initto SKL and BXT only.v6: Rebased (me)
Tested-by Clinton Taylor <[email protected]>Reviewed-by Clinton Taylor <[email protected]>Signed-off-by Chandra Konduru <[email protected]>Signed-off-by Nabendu Maiti <[email protected]>Signed-off-by Vidya Srinivas <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 14786
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4
-0@@ -14780,6 +14780,11 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; }break ; +case DRM_FORMAT_NV12 : +if (INTEL_GEN (dev_priv) >=9 ) +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +break ;
That doesn't really make sense. Are you trying to reject NV12 on SKL/BXT or accept it? The gen>=9 check is redundant.
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+ goto err;default :DRM_DEBUG_KMS ("unsupported pixel format: %s\n" ,drm_get_format_name (mode_cmd->pixel_format, &format_name));Signature · 6 lines
1.9.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
Patchwork
CI✓ Fi.CI.BAT: success for Adding NV12 support for SKL display (rev5)
In reply to Vidya Srinivas== Series Details ==
== Series Details ==
Series: Adding NV12 support for SKL display (rev5)
URL : https://patchwork.freedesktop.org/series/25377/
State : success
== Summary ==
Series 25377v5 Adding NV12 support for SKL display
https://patchwork.freedesktop.org/api/1.0/series/25377/revisions/5/mbox/
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-pnv-d510) fdo#101597
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-j1900) fdo#101705fdo#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:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:436s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:431s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:356s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:523s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:514s fi-byt-j1900 total:279 pass:255 dwarn:0 dfail:0 fail:0 skip:24 time:492s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:486s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:599s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:442s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:412s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:426s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:503s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:471s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:578s fi-kbl-r total:279 pass:260 dwarn:1 dfail:0 fail:0 skip:18 time:586s fi-pnv-d510 total:279 pass:222 dwarn:2 dfail:0 fail:0 skip:55 time:564s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:457s fi-skl-6700hq total:279 pass:262 dwarn:0 dfail:0 fail:0 skip:17 time:594s fi-skl-6700k total:279 pass:257 dwarn:4 dfail:0 fail:0 skip:18 time:469s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:477s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:439s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:500s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:405s
85c472b33a364770b4c4af0caa8b8a828e0c0498 drm-tip: 2017y-07m-11d-14h-04m-44s UTC integration manifest 39f1ae5d drm/i915: Add NV12 support to intel_framebuffer_init
1dd7cae drm/i915: Add NV12 as supported format for sprite plane
26faf59 drm/i915: Add NV12 as supported format for primary plane
8ea488b drm/i915: Upscale scaler max scale for NV12
15c8578 drm/i915: Update format_is_yuv() to include NV12
4e2ec1c drm/i915: Set scaler mode for NV12
5721383 drm/i915: Add render decompression support
5663784 drm/i915: Implement .get_format_info() hook for CCS
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5162/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 32 lines · Vidya Srinivas
This patch series is adding NV12 support for Skylake display after rebasing on latest drm-intel-nightly. Initial series of the patches can be found here:
https://lists.freedesktop.org/archives/intel-gfx/2015-May/066786.htmlFeature has been currently tested with custom linux based test tool IGT test development is under progress. Floating these patches for initial review. These NV12 patches are dependent on Ville's patches mentioned below.
Update from last rev:
Patches were initial reviewed last when floated but currently there was a design change with respect to
- the way fb offset is handled
- the way rotation is handled
Rebase of the current NV12 patch series has been done as per the current changes on drm-intel-nightly.
Review comments from Ville (12th June 2017) have been addressed Review comments from Clinton A Taylor (7th July 2017) have been addressed
Review comments from Clinton A Taylor (10th July 2017) have been addressed. Had missed out tested-by/reviewed-by in the patches. Fixed that error in this series.Chandra Konduru (6):
drm/i915: Set scaler mode for NV12
drm/i915: Updateformat_is_yuv()to include NV12 drm/i915: Upscale scaler max scale for NV12 drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane drm/i915: Add NV12 support tointel_framebuffer_init
Quoted 3 lines
Ville Syrjälä (2):
drm/i915: Implement .get_format_info() hook for CCS drm/i915: Add render decompression support
These two are some old stale versions of my CCS patches. I suppose it shouldn't matter too much, as long as no one has based any userspace tests on these since later versions will change how interpret fb->offsets[].
Quoted 19 lines
drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 24 +++ drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 313 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 29 +++- drivers/gpu/drm/i915/intel_sprite.c | 16 +- include/drm/drm_mode_config.h | 3 +- include/uapi/drm/drm_fourcc.h | 3 + 9 files changed, 365 insertions(+), 36 deletions(-)Signature · 6 lines
1.9.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
Thank you for working on NV12 plane support. ChromeOS eagerly wants this feature to save power on Youtube. If it's landed soon, I'll really appreciate it.
Kristian is working on backporting it to the downstream ChromeOS kernel.
https://chromium-review.googlesource.com/c/601288
I tested it on my Apollo Lake chromebook, but there is blackscreen flickering. NOTE: RGBA, RGBX, BGRA, BGRX, YUYV works without flickering.
https://goo.gl/photos/tr5VfMiKeyEpDg9K6
Best regards,
DS
Quoted 62 lines · Ville Syrjälä
Quoted 32 lines · Vidya Srinivas
This patch series is adding NV12 support for Skylake display after rebasing on latest drm-intel-nightly. Initial series of the patches can be found here:
https://lists.freedesktop.org/archives/intel-gfx/2015-May/066786.htmlFeature has been currently tested with custom linux based test tool IGT test development is under progress. Floating these patches for initial review. These NV12 patches are dependent on Ville's patches mentioned below.
Update from last rev:
Patches were initial reviewed last when floated but currently there was a design change with respect to
- the way fb offset is handled
- the way rotation is handled
Rebase of the current NV12 patch series has been done as per the current changes on drm-intel-nightly.
Review comments from Ville (12th June 2017) have been addressed Review comments from Clinton A Taylor (7th July 2017) have been addressed
Review comments from Clinton A Taylor (10th July 2017) have been addressed. Had missed out tested-by/reviewed-by in the patches. Fixed that error in this series.Chandra Konduru (6):
drm/i915: Set scaler mode for NV12
drm/i915: Updateformat_is_yuv()to include NV12 drm/i915: Upscale scaler max scale for NV12 drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane drm/i915: Add NV12 support tointel_framebuffer_initQuoted 3 lines
Ville Syrjälä (2):
drm/i915: Implement .get_format_info() hook for CCS drm/i915: Add render decompression supportThese two are some old stale versions of my CCS patches. I suppose it shouldn't matter too much, as long as no one has based any userspace tests on these since later versions will change how interpret fb->offsets[].
Quoted 5 lines
drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 24 +++ drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 313++++++++++++++++++++++++++++++++---
Quoted 7 lines
drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 29 +++- drivers/gpu/drm/i915/intel_sprite.c | 16 +- include/drm/drm_mode_config.h | 3 +- include/uapi/drm/drm_fourcc.h | 3 + 9 files changed, 365 insertions(+), 36 deletions(-)Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
I tested it on my Kaby Lake chromebook, and it works perfectly.
Best regards,
DS
Quoted 11 lines · Dongseong
Thank you for working on NV12 plane support. ChromeOS eagerly wants this feature to save power on Youtube. If it's landed soon, I'll really appreciate it.
Kristian is working on backporting it to the downstream ChromeOS kernel.
https://chromium-review.googlesource.com/c/601288I tested it on my Apollo Lake chromebook, but there is blackscreen flickering. NOTE: RGBA, RGBX, BGRA, BGRX, YUYV works without flickering.
https://goo.gl/photos/tr5VfMiKeyEpDg9K6
Quoted 79 lines
Best regards,
DSQuoted 70 lines · Ville Syrjälä
Quoted 32 lines · Vidya Srinivas
This patch series is adding NV12 support for Skylake display after rebasing on latest drm-intel-nightly. Initial series of the patches can be found here:
https://lists.freedesktop.org/archives/intel-gfx/2015-May/066786.htmlFeature has been currently tested with custom linux based test tool IGT test development is under progress. Floating these patches for initial review. These NV12 patches are dependent on Ville's patches mentioned below.
Update from last rev:
Patches were initial reviewed last when floated but currently there was a design change with respect to
- the way fb offset is handled
- the way rotation is handled
Rebase of the current NV12 patch series has been done as per the current changes on drm-intel-nightly.
Review comments from Ville (12th June 2017) have been addressed Review comments from Clinton A Taylor (7th July 2017) have been addressed
Review comments from Clinton A Taylor (10th July 2017) have been addressed. Had missed out tested-by/reviewed-by in the patches. Fixed that error in this series.Chandra Konduru (6):
drm/i915: Set scaler mode for NV12
drm/i915: Updateformat_is_yuv()to include NV12 drm/i915: Upscale scaler max scale for NV12 drm/i915: Add NV12 as supported format for primary plane drm/i915: Add NV12 as supported format for sprite plane drm/i915: Add NV12 support tointel_framebuffer_initQuoted 3 lines
Ville Syrjälä (2):
drm/i915: Implement .get_format_info() hook for CCS drm/i915: Add render decompression supportThese two are some old stale versions of my CCS patches. I suppose it shouldn't matter too much, as long as no one has based any userspace tests on these since later versions will change how interpret fb->offsets[].
Quoted 13 lines
drivers/gpu/drm/drm_fourcc.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 24 +++ drivers/gpu/drm/i915/intel_atomic.c | 8 +- drivers/gpu/drm/i915/intel_display.c | 313 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_pm.c | 29 +++- drivers/gpu/drm/i915/intel_sprite.c | 16 +- include/drm/drm_mode_config.h | 3 +- include/uapi/drm/drm_fourcc.h | 3 + 9 files changed, 365 insertions(+), 36 deletions(-)Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx