drm/dsc: Add native 420 and 422 support to compute_rc_params

Native 420 and 422 transfer modes are new in DSC1.2

In these modes, each two pixels of a slice are treated as one
pixel, so the slice width is half as large (round down) for
the purposes of calucating the groups per line and chunk size
in bytes

In native 422 mode, each pixel has four components, so the
mux component of a group is larger by one additional mux word
and one additional component

Now that there is native 422 support, the configuration option
previously called enable422 is renamed to simple_422 to avoid
confusion

Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190221202001.28430-3-David.Francis@amd.com

diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
index b7f1903508a42d1dc07d1ee0dd659e88fcbd5168..d77570bf6ac494244e9564ebeb5bbf501e2aa46f 100644 (file)
--- a/drivers/gpu/drm/drm_dsc.c
+++ b/drivers/gpu/drm/drm_dsc.c
@@ -95,7 +95,7 @@ void drm_dsc_pps_infoframe_pack(struct drm_dsc_pps_infoframe *pps_sdp,
                ((dsc_cfg->bits_per_pixel & DSC_PPS_BPP_HIGH_MASK) >>
                 DSC_PPS_MSB_SHIFT) |
                dsc_cfg->vbr_enable << DSC_PPS_VBR_EN_SHIFT |
-               dsc_cfg->enable422 << DSC_PPS_SIMPLE422_SHIFT |
+               dsc_cfg->simple_422 << DSC_PPS_SIMPLE422_SHIFT |
                dsc_cfg->convert_rgb << DSC_PPS_CONVERT_RGB_SHIFT |
                dsc_cfg->block_pred_enable << DSC_PPS_BLOCK_PRED_EN_SHIFT;
 
@@ -249,7 +249,7 @@ EXPORT_SYMBOL(drm_dsc_pps_infoframe_pack);
 /**
  * drm_dsc_compute_rc_parameters() - Write rate control
  * parameters to the dsc configuration defined in
- * &struct drm_dsc_config in accordance with the DSC 1.1
+ * &struct drm_dsc_config in accordance with the DSC 1.2
  * specification. Some configuration fields must be present
  * beforehand.
  *
@@ -266,19 +266,34 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
        unsigned long final_scale = 0;
        unsigned long rbs_min = 0;
 
-       /* Number of groups used to code each line of a slice */
-       groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width,
-                                      DSC_RC_PIXELS_PER_GROUP);
+       if (vdsc_cfg->native_420 || vdsc_cfg->native_422) {
+               /* Number of groups used to code each line of a slice */
+               groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width / 2,
+                                              DSC_RC_PIXELS_PER_GROUP);
 
-       /* chunksize in Bytes */
-       vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width *
-                                                 vdsc_cfg->bits_per_pixel,
-                                                 (8 * 16));
+               /* chunksize in Bytes */
+               vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width / 2 *
+                                                         vdsc_cfg->bits_per_pixel,
+                                                         (8 * 16));
+       } else {
+               /* Number of groups used to code each line of a slice */
+               groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width,
+                                              DSC_RC_PIXELS_PER_GROUP);
+
+               /* chunksize in Bytes */
+               vdsc_cfg->slice_chunk_size = DIV_ROUND_UP(vdsc_cfg->slice_width *
+                                                         vdsc_cfg->bits_per_pixel,
+                                                         (8 * 16));
+       }
 
        if (vdsc_cfg->convert_rgb)
                num_extra_mux_bits = 3 * (vdsc_cfg->mux_word_size +
                                          (4 * vdsc_cfg->bits_per_component + 4)
                                          - 2);
+       else if (vdsc_cfg->native_422)
+               num_extra_mux_bits = 4 * vdsc_cfg->mux_word_size +
+                       (4 * vdsc_cfg->bits_per_component + 4) +
+                       3 * (4 * vdsc_cfg->bits_per_component) - 2;
        else
                num_extra_mux_bits = 3 * vdsc_cfg->mux_word_size +
                        (4 * vdsc_cfg->bits_per_component + 4) +

diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/intel_vdsc.c
index 2d059ebc9bd001d88a5d52a45986075a38ffb295..8c8d9615733319ff5add1fafbd7198d212c7ec28 100644 (file)
--- a/drivers/gpu/drm/i915/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/intel_vdsc.c
@@ -368,7 +368,7 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
                        DSC_1_1_MAX_LINEBUF_DEPTH_BITS : line_buf_depth;
 
        /* Gen 11 does not support YCbCr */
-       vdsc_cfg->enable422 = false;
+       vdsc_cfg->simple_422 = false;
        /* Gen 11 does not support VBR */
        vdsc_cfg->vbr_enable = false;
        vdsc_cfg->block_pred_enable =
@@ -495,7 +495,7 @@ static void intel_configure_pps_for_dsc_encoder(struct intel_encoder *encoder,
                pps_val |= DSC_BLOCK_PREDICTION;
        if (vdsc_cfg->convert_rgb)
                pps_val |= DSC_COLOR_SPACE_CONVERSION;
-       if (vdsc_cfg->enable422)
+       if (vdsc_cfg->simple_422)
                pps_val |= DSC_422_ENABLE;
        if (vdsc_cfg->vbr_enable)
                pps_val |= DSC_VBR_ENABLE;

diff --git a/include/drm/drm_dsc.h b/include/drm/drm_dsc.h
index 5a98b8dfdf4344c8b515a10cbec9400b5868c99b..f26a89e1b68a5b16b68d134b6c6152bb70918ce7 100644 (file)
--- a/include/drm/drm_dsc.h
+++ b/include/drm/drm_dsc.h
@@ -101,9 +101,9 @@ struct drm_dsc_config {
         */
        u16 slice_height;
        /**
-        * @enable422: True for 4_2_2 sampling, false for 4_4_4 sampling
+        * @simple_422: True if simple 4_2_2 mode is enabled else False
         */
-       bool enable422;
+       bool simple_422;
        /**
         * @pic_width: Width of the input display frame in pixels
         */