drm/amd/display: renaming filename for hubp
authorYue Hin Lau <Yuehin.Lau@amd.com>
Thu, 5 Oct 2017 16:30:14 +0000 (12:30 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Oct 2017 20:48:52 +0000 (16:48 -0400)
Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/Makefile
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c [deleted file]
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h [deleted file]
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

index 6b19106f46795159f15ab9d599e0bab4c4435aaa..ebeb88283a143faf62d06ed0f76374aa80ddf3cd 100644 (file)
@@ -3,7 +3,7 @@
 
 DCN10 = dcn10_resource.o dcn10_ipp.o dcn10_hw_sequencer.o \
                dcn10_dpp.o dcn10_opp.o dcn10_timing_generator.o \
-               dcn10_mem_input.o dcn10_mpc.o \
+               dcn10_hubp.o dcn10_mpc.o \
                dcn10_dpp_dscl.o dcn10_dpp_cm.o dcn10_cm_common.o
 
 AMD_DAL_DCN10 = $(addprefix $(AMDDALPATH)/dc/dcn10/,$(DCN10))
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
new file mode 100644 (file)
index 0000000..b13dee6
--- /dev/null
@@ -0,0 +1,960 @@
+/*
+ * Copyright 2012-15 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+#include "dm_services.h"
+#include "dce_calcs.h"
+#include "reg_helper.h"
+#include "basics/conversion.h"
+#include "dcn10_hubp.h"
+
+#define REG(reg)\
+       hubp1->mi_regs->reg
+
+#define CTX \
+       hubp1->base.ctx
+
+#undef FN
+#define FN(reg_name, field_name) \
+       hubp1->mi_shift->field_name, hubp1->mi_mask->field_name
+
+void hubp1_set_blank(struct hubp *hubp, bool blank)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       uint32_t blank_en = blank ? 1 : 0;
+
+       REG_UPDATE_2(DCHUBP_CNTL,
+                       HUBP_BLANK_EN, blank_en,
+                       HUBP_TTU_DISABLE, blank_en);
+
+       if (blank) {
+               REG_WAIT(DCHUBP_CNTL,
+                               HUBP_NO_OUTSTANDING_REQ, 1,
+                               1, 200);
+               hubp->mpcc_id = 0xf;
+               hubp->opp_id = 0xf;
+       }
+}
+
+static void hubp1_set_hubp_blank_en(struct hubp *hubp, bool blank)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       uint32_t blank_en = blank ? 1 : 0;
+
+       REG_UPDATE(DCHUBP_CNTL, HUBP_BLANK_EN, blank_en);
+}
+
+static void hubp1_vready_workaround(struct hubp *hubp,
+               struct _vcs_dpi_display_pipe_dest_params_st *pipe_dest)
+{
+       uint32_t value = 0;
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       /* set HBUBREQ_DEBUG_DB[12] = 1 */
+       value = REG_READ(HUBPREQ_DEBUG_DB);
+
+       /* hack mode disable */
+       value |= 0x100;
+       value &= ~0x1000;
+
+       if ((pipe_dest->vstartup_start - 2*(pipe_dest->vready_offset+pipe_dest->vupdate_width
+               + pipe_dest->vupdate_offset) / pipe_dest->htotal) <= pipe_dest->vblank_end) {
+               /* if (eco_fix_needed(otg_global_sync_timing)
+                * set HBUBREQ_DEBUG_DB[12] = 1 */
+               value |= 0x1000;
+       }
+
+       REG_WRITE(HUBPREQ_DEBUG_DB, value);
+}
+
+void hubp1_program_tiling(
+       struct dcn10_hubp *hubp1,
+       const union dc_tiling_info *info,
+       const enum surface_pixel_format pixel_format)
+{
+       REG_UPDATE_6(DCSURF_ADDR_CONFIG,
+                       NUM_PIPES, log_2(info->gfx9.num_pipes),
+                       NUM_BANKS, log_2(info->gfx9.num_banks),
+                       PIPE_INTERLEAVE, info->gfx9.pipe_interleave,
+                       NUM_SE, log_2(info->gfx9.num_shader_engines),
+                       NUM_RB_PER_SE, log_2(info->gfx9.num_rb_per_se),
+                       MAX_COMPRESSED_FRAGS, log_2(info->gfx9.max_compressed_frags));
+
+       REG_UPDATE_4(DCSURF_TILING_CONFIG,
+                       SW_MODE, info->gfx9.swizzle,
+                       META_LINEAR, info->gfx9.meta_linear,
+                       RB_ALIGNED, info->gfx9.rb_aligned,
+                       PIPE_ALIGNED, info->gfx9.pipe_aligned);
+}
+
+void hubp1_program_size_and_rotation(
+       struct dcn10_hubp *hubp1,
+       enum dc_rotation_angle rotation,
+       enum surface_pixel_format format,
+       const union plane_size *plane_size,
+       struct dc_plane_dcc_param *dcc,
+       bool horizontal_mirror)
+{
+       uint32_t pitch, meta_pitch, pitch_c, meta_pitch_c, mirror;
+
+       /* Program data and meta surface pitch (calculation from addrlib)
+        * 444 or 420 luma
+        */
+       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
+               pitch = plane_size->video.luma_pitch - 1;
+               meta_pitch = dcc->video.meta_pitch_l - 1;
+               pitch_c = plane_size->video.chroma_pitch - 1;
+               meta_pitch_c = dcc->video.meta_pitch_c - 1;
+       } else {
+               pitch = plane_size->grph.surface_pitch - 1;
+               meta_pitch = dcc->grph.meta_pitch - 1;
+               pitch_c = 0;
+               meta_pitch_c = 0;
+       }
+
+       if (!dcc->enable) {
+               meta_pitch = 0;
+               meta_pitch_c = 0;
+       }
+
+       REG_UPDATE_2(DCSURF_SURFACE_PITCH,
+                       PITCH, pitch, META_PITCH, meta_pitch);
+
+       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
+               REG_UPDATE_2(DCSURF_SURFACE_PITCH_C,
+                       PITCH_C, pitch_c, META_PITCH_C, meta_pitch_c);
+
+       if (horizontal_mirror)
+               mirror = 1;
+       else
+               mirror = 0;
+
+
+       /* Program rotation angle and horz mirror - no mirror */
+       if (rotation == ROTATION_ANGLE_0)
+               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
+                               ROTATION_ANGLE, 0,
+                               H_MIRROR_EN, mirror);
+       else if (rotation == ROTATION_ANGLE_90)
+               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
+                               ROTATION_ANGLE, 1,
+                               H_MIRROR_EN, mirror);
+       else if (rotation == ROTATION_ANGLE_180)
+               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
+                               ROTATION_ANGLE, 2,
+                               H_MIRROR_EN, mirror);
+       else if (rotation == ROTATION_ANGLE_270)
+               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
+                               ROTATION_ANGLE, 3,
+                               H_MIRROR_EN, mirror);
+}
+
+void hubp1_program_pixel_format(
+       struct dcn10_hubp *hubp1,
+       enum surface_pixel_format format)
+{
+       uint32_t red_bar = 3;
+       uint32_t blue_bar = 2;
+
+       /* swap for ABGR format */
+       if (format == SURFACE_PIXEL_FORMAT_GRPH_ABGR8888
+                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010
+                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS
+                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616F) {
+               red_bar = 2;
+               blue_bar = 3;
+       }
+
+       REG_UPDATE_2(HUBPRET_CONTROL,
+                       CROSSBAR_SRC_CB_B, blue_bar,
+                       CROSSBAR_SRC_CR_R, red_bar);
+
+       /* Mapping is same as ipp programming (cnvc) */
+
+       switch (format) {
+       case SURFACE_PIXEL_FORMAT_GRPH_ARGB1555:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 1);
+               break;
+       case SURFACE_PIXEL_FORMAT_GRPH_RGB565:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 3);
+               break;
+       case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 8);
+               break;
+       case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 10);
+               break;
+       case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 22);
+               break;
+       case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616F:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616F:/*we use crossbar already*/
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 24);
+               break;
+
+       case SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 65);
+               break;
+       case SURFACE_PIXEL_FORMAT_VIDEO_420_YCrCb:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 64);
+               break;
+       case SURFACE_PIXEL_FORMAT_VIDEO_420_10bpc_YCbCr:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 67);
+               break;
+       case SURFACE_PIXEL_FORMAT_VIDEO_420_10bpc_YCrCb:
+               REG_UPDATE(DCSURF_SURFACE_CONFIG,
+                               SURFACE_PIXEL_FORMAT, 66);
+               break;
+       default:
+               BREAK_TO_DEBUGGER();
+               break;
+       }
+
+       /* don't see the need of program the xbar in DCN 1.0 */
+}
+
+bool hubp1_program_surface_flip_and_addr(
+       struct hubp *hubp,
+       const struct dc_plane_address *address,
+       bool flip_immediate)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       /* program flip type */
+       REG_SET(DCSURF_FLIP_CONTROL, 0,
+                       SURFACE_FLIP_TYPE, flip_immediate);
+
+       /* HW automatically latch rest of address register on write to
+        * DCSURF_PRIMARY_SURFACE_ADDRESS if SURFACE_UPDATE_LOCK is not used
+        *
+        * program high first and then the low addr, order matters!
+        */
+       switch (address->type) {
+       case PLN_ADDR_TYPE_GRAPHICS:
+               /* DCN1.0 does not support const color
+                * TODO: program DCHUBBUB_RET_PATH_DCC_CFGx_0/1
+                * base on address->grph.dcc_const_color
+                * x = 0, 2, 4, 6 for pipe 0, 1, 2, 3 for rgb and luma
+                * x = 1, 3, 5, 7 for pipe 0, 1, 2, 3 for chroma
+                */
+
+               if (address->grph.addr.quad_part == 0)
+                       break;
+
+               REG_UPDATE(DCSURF_SURFACE_CONTROL,
+                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
+
+               if (address->grph.meta_addr.quad_part != 0) {
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
+                                       PRIMARY_META_SURFACE_ADDRESS_HIGH,
+                                       address->grph.meta_addr.high_part);
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
+                                       PRIMARY_META_SURFACE_ADDRESS,
+                                       address->grph.meta_addr.low_part);
+               }
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
+                               PRIMARY_SURFACE_ADDRESS_HIGH,
+                               address->grph.addr.high_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
+                               PRIMARY_SURFACE_ADDRESS,
+                               address->grph.addr.low_part);
+               break;
+       case PLN_ADDR_TYPE_VIDEO_PROGRESSIVE:
+               if (address->video_progressive.luma_addr.quad_part == 0
+                       || address->video_progressive.chroma_addr.quad_part == 0)
+                       break;
+
+               REG_UPDATE(DCSURF_SURFACE_CONTROL,
+                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
+
+               if (address->video_progressive.luma_meta_addr.quad_part != 0) {
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, 0,
+                               PRIMARY_META_SURFACE_ADDRESS_HIGH_C,
+                               address->video_progressive.chroma_meta_addr.high_part);
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, 0,
+                               PRIMARY_META_SURFACE_ADDRESS_C,
+                               address->video_progressive.chroma_meta_addr.low_part);
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
+                               PRIMARY_META_SURFACE_ADDRESS_HIGH,
+                               address->video_progressive.luma_meta_addr.high_part);
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
+                               PRIMARY_META_SURFACE_ADDRESS,
+                               address->video_progressive.luma_meta_addr.low_part);
+               }
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, 0,
+                       PRIMARY_SURFACE_ADDRESS_HIGH_C,
+                       address->video_progressive.chroma_addr.high_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_C, 0,
+                       PRIMARY_SURFACE_ADDRESS_C,
+                       address->video_progressive.chroma_addr.low_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
+                       PRIMARY_SURFACE_ADDRESS_HIGH,
+                       address->video_progressive.luma_addr.high_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
+                       PRIMARY_SURFACE_ADDRESS,
+                       address->video_progressive.luma_addr.low_part);
+               break;
+       case PLN_ADDR_TYPE_GRPH_STEREO:
+               if (address->grph_stereo.left_addr.quad_part == 0)
+                       break;
+               if (address->grph_stereo.right_addr.quad_part == 0)
+                       break;
+
+               REG_UPDATE(DCSURF_SURFACE_CONTROL,
+                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
+
+               if (address->grph_stereo.right_meta_addr.quad_part != 0) {
+
+                       REG_SET(DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, 0,
+                                       SECONDARY_META_SURFACE_ADDRESS_HIGH,
+                                       address->grph_stereo.right_meta_addr.high_part);
+
+                       REG_SET(DCSURF_SECONDARY_META_SURFACE_ADDRESS, 0,
+                                       SECONDARY_META_SURFACE_ADDRESS,
+                                       address->grph_stereo.right_meta_addr.low_part);
+               }
+               if (address->grph_stereo.left_meta_addr.quad_part != 0) {
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
+                                       PRIMARY_META_SURFACE_ADDRESS_HIGH,
+                                       address->grph_stereo.left_meta_addr.high_part);
+
+                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
+                                       PRIMARY_META_SURFACE_ADDRESS,
+                                       address->grph_stereo.left_meta_addr.low_part);
+               }
+
+               REG_SET(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, 0,
+                               SECONDARY_SURFACE_ADDRESS_HIGH,
+                               address->grph_stereo.right_addr.high_part);
+
+               REG_SET(DCSURF_SECONDARY_SURFACE_ADDRESS, 0,
+                               SECONDARY_SURFACE_ADDRESS,
+                               address->grph_stereo.right_addr.low_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
+                               PRIMARY_SURFACE_ADDRESS_HIGH,
+                               address->grph_stereo.left_addr.high_part);
+
+               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
+                               PRIMARY_SURFACE_ADDRESS,
+                               address->grph_stereo.left_addr.low_part);
+               break;
+       default:
+               BREAK_TO_DEBUGGER();
+               break;
+       }
+
+       hubp->request_address = *address;
+
+       if (flip_immediate)
+               hubp->current_address = *address;
+
+       return true;
+}
+
+void hubp1_dcc_control(struct hubp *hubp, bool enable,
+               bool independent_64b_blks)
+{
+       uint32_t dcc_en = enable ? 1 : 0;
+       uint32_t dcc_ind_64b_blk = independent_64b_blks ? 1 : 0;
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       REG_UPDATE_2(DCSURF_SURFACE_CONTROL,
+                       PRIMARY_SURFACE_DCC_EN, dcc_en,
+                       PRIMARY_SURFACE_DCC_IND_64B_BLK, dcc_ind_64b_blk);
+}
+
+void hubp1_program_surface_config(
+       struct hubp *hubp,
+       enum surface_pixel_format format,
+       union dc_tiling_info *tiling_info,
+       union plane_size *plane_size,
+       enum dc_rotation_angle rotation,
+       struct dc_plane_dcc_param *dcc,
+       bool horizontal_mirror)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       hubp1_dcc_control(hubp, dcc->enable, dcc->grph.independent_64b_blks);
+       hubp1_program_tiling(hubp1, tiling_info, format);
+       hubp1_program_size_and_rotation(
+                       hubp1, rotation, format, plane_size, dcc, horizontal_mirror);
+       hubp1_program_pixel_format(hubp1, format);
+}
+
+void hubp1_program_requestor(
+               struct hubp *hubp,
+               struct _vcs_dpi_display_rq_regs_st *rq_regs)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       REG_UPDATE(HUBPRET_CONTROL,
+                       DET_BUF_PLANE1_BASE_ADDRESS, rq_regs->plane1_base_address);
+       REG_SET_4(DCN_EXPANSION_MODE, 0,
+                       DRQ_EXPANSION_MODE, rq_regs->drq_expansion_mode,
+                       PRQ_EXPANSION_MODE, rq_regs->prq_expansion_mode,
+                       MRQ_EXPANSION_MODE, rq_regs->mrq_expansion_mode,
+                       CRQ_EXPANSION_MODE, rq_regs->crq_expansion_mode);
+       REG_SET_8(DCHUBP_REQ_SIZE_CONFIG, 0,
+               CHUNK_SIZE, rq_regs->rq_regs_l.chunk_size,
+               MIN_CHUNK_SIZE, rq_regs->rq_regs_l.min_chunk_size,
+               META_CHUNK_SIZE, rq_regs->rq_regs_l.meta_chunk_size,
+               MIN_META_CHUNK_SIZE, rq_regs->rq_regs_l.min_meta_chunk_size,
+               DPTE_GROUP_SIZE, rq_regs->rq_regs_l.dpte_group_size,
+               MPTE_GROUP_SIZE, rq_regs->rq_regs_l.mpte_group_size,
+               SWATH_HEIGHT, rq_regs->rq_regs_l.swath_height,
+               PTE_ROW_HEIGHT_LINEAR, rq_regs->rq_regs_l.pte_row_height_linear);
+       REG_SET_8(DCHUBP_REQ_SIZE_CONFIG_C, 0,
+               CHUNK_SIZE_C, rq_regs->rq_regs_c.chunk_size,
+               MIN_CHUNK_SIZE_C, rq_regs->rq_regs_c.min_chunk_size,
+               META_CHUNK_SIZE_C, rq_regs->rq_regs_c.meta_chunk_size,
+               MIN_META_CHUNK_SIZE_C, rq_regs->rq_regs_c.min_meta_chunk_size,
+               DPTE_GROUP_SIZE_C, rq_regs->rq_regs_c.dpte_group_size,
+               MPTE_GROUP_SIZE_C, rq_regs->rq_regs_c.mpte_group_size,
+               SWATH_HEIGHT_C, rq_regs->rq_regs_c.swath_height,
+               PTE_ROW_HEIGHT_LINEAR_C, rq_regs->rq_regs_c.pte_row_height_linear);
+}
+
+
+void hubp1_program_deadline(
+               struct hubp *hubp,
+               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
+               struct _vcs_dpi_display_ttu_regs_st *ttu_attr)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       /* DLG - Per hubp */
+       REG_SET_2(BLANK_OFFSET_0, 0,
+               REFCYC_H_BLANK_END, dlg_attr->refcyc_h_blank_end,
+               DLG_V_BLANK_END, dlg_attr->dlg_vblank_end);
+
+       REG_SET(BLANK_OFFSET_1, 0,
+               MIN_DST_Y_NEXT_START, dlg_attr->min_dst_y_next_start);
+
+       REG_SET(DST_DIMENSIONS, 0,
+               REFCYC_PER_HTOTAL, dlg_attr->refcyc_per_htotal);
+
+       REG_SET_2(DST_AFTER_SCALER, 0,
+               REFCYC_X_AFTER_SCALER, dlg_attr->refcyc_x_after_scaler,
+               DST_Y_AFTER_SCALER, dlg_attr->dst_y_after_scaler);
+
+       if (REG(PREFETCH_SETTINS))
+               REG_SET_2(PREFETCH_SETTINS, 0,
+                       DST_Y_PREFETCH, dlg_attr->dst_y_prefetch,
+                       VRATIO_PREFETCH, dlg_attr->vratio_prefetch);
+       else
+               REG_SET_2(PREFETCH_SETTINGS, 0,
+                       DST_Y_PREFETCH, dlg_attr->dst_y_prefetch,
+                       VRATIO_PREFETCH, dlg_attr->vratio_prefetch);
+
+       REG_SET_2(VBLANK_PARAMETERS_0, 0,
+               DST_Y_PER_VM_VBLANK, dlg_attr->dst_y_per_vm_vblank,
+               DST_Y_PER_ROW_VBLANK, dlg_attr->dst_y_per_row_vblank);
+
+       REG_SET(REF_FREQ_TO_PIX_FREQ, 0,
+               REF_FREQ_TO_PIX_FREQ, dlg_attr->ref_freq_to_pix_freq);
+
+       /* DLG - Per luma/chroma */
+       REG_SET(VBLANK_PARAMETERS_1, 0,
+               REFCYC_PER_PTE_GROUP_VBLANK_L, dlg_attr->refcyc_per_pte_group_vblank_l);
+
+       REG_SET(VBLANK_PARAMETERS_3, 0,
+               REFCYC_PER_META_CHUNK_VBLANK_L, dlg_attr->refcyc_per_meta_chunk_vblank_l);
+
+       REG_SET(NOM_PARAMETERS_0, 0,
+               DST_Y_PER_PTE_ROW_NOM_L, dlg_attr->dst_y_per_pte_row_nom_l);
+
+       REG_SET(NOM_PARAMETERS_1, 0,
+               REFCYC_PER_PTE_GROUP_NOM_L, dlg_attr->refcyc_per_pte_group_nom_l);
+
+       REG_SET(NOM_PARAMETERS_4, 0,
+               DST_Y_PER_META_ROW_NOM_L, dlg_attr->dst_y_per_meta_row_nom_l);
+
+       REG_SET(NOM_PARAMETERS_5, 0,
+               REFCYC_PER_META_CHUNK_NOM_L, dlg_attr->refcyc_per_meta_chunk_nom_l);
+
+       REG_SET_2(PER_LINE_DELIVERY_PRE, 0,
+               REFCYC_PER_LINE_DELIVERY_PRE_L, dlg_attr->refcyc_per_line_delivery_pre_l,
+               REFCYC_PER_LINE_DELIVERY_PRE_C, dlg_attr->refcyc_per_line_delivery_pre_c);
+
+       REG_SET_2(PER_LINE_DELIVERY, 0,
+               REFCYC_PER_LINE_DELIVERY_L, dlg_attr->refcyc_per_line_delivery_l,
+               REFCYC_PER_LINE_DELIVERY_C, dlg_attr->refcyc_per_line_delivery_c);
+
+       if (REG(PREFETCH_SETTINS_C))
+               REG_SET(PREFETCH_SETTINS_C, 0,
+                       VRATIO_PREFETCH_C, dlg_attr->vratio_prefetch_c);
+       else
+               REG_SET(PREFETCH_SETTINGS_C, 0,
+                       VRATIO_PREFETCH_C, dlg_attr->vratio_prefetch_c);
+
+       REG_SET(VBLANK_PARAMETERS_2, 0,
+               REFCYC_PER_PTE_GROUP_VBLANK_C, dlg_attr->refcyc_per_pte_group_vblank_c);
+
+       REG_SET(VBLANK_PARAMETERS_4, 0,
+               REFCYC_PER_META_CHUNK_VBLANK_C, dlg_attr->refcyc_per_meta_chunk_vblank_c);
+
+       REG_SET(NOM_PARAMETERS_2, 0,
+               DST_Y_PER_PTE_ROW_NOM_C, dlg_attr->dst_y_per_pte_row_nom_c);
+
+       REG_SET(NOM_PARAMETERS_3, 0,
+               REFCYC_PER_PTE_GROUP_NOM_C, dlg_attr->refcyc_per_pte_group_nom_c);
+
+       REG_SET(NOM_PARAMETERS_6, 0,
+               DST_Y_PER_META_ROW_NOM_C, dlg_attr->dst_y_per_meta_row_nom_c);
+
+       REG_SET(NOM_PARAMETERS_7, 0,
+               REFCYC_PER_META_CHUNK_NOM_C, dlg_attr->refcyc_per_meta_chunk_nom_c);
+
+       /* TTU - per hubp */
+       REG_SET_2(DCN_TTU_QOS_WM, 0,
+               QoS_LEVEL_LOW_WM, ttu_attr->qos_level_low_wm,
+               QoS_LEVEL_HIGH_WM, ttu_attr->qos_level_high_wm);
+
+       REG_SET_2(DCN_GLOBAL_TTU_CNTL, 0,
+               MIN_TTU_VBLANK, ttu_attr->min_ttu_vblank,
+               QoS_LEVEL_FLIP, ttu_attr->qos_level_flip);
+
+       /* TTU - per luma/chroma */
+       /* Assumed surf0 is luma and 1 is chroma */
+
+       REG_SET_3(DCN_SURF0_TTU_CNTL0, 0,
+               REFCYC_PER_REQ_DELIVERY, ttu_attr->refcyc_per_req_delivery_l,
+               QoS_LEVEL_FIXED, ttu_attr->qos_level_fixed_l,
+               QoS_RAMP_DISABLE, ttu_attr->qos_ramp_disable_l);
+
+       REG_SET(DCN_SURF0_TTU_CNTL1, 0,
+               REFCYC_PER_REQ_DELIVERY_PRE,
+               ttu_attr->refcyc_per_req_delivery_pre_l);
+
+       REG_SET_3(DCN_SURF1_TTU_CNTL0, 0,
+               REFCYC_PER_REQ_DELIVERY, ttu_attr->refcyc_per_req_delivery_c,
+               QoS_LEVEL_FIXED, ttu_attr->qos_level_fixed_c,
+               QoS_RAMP_DISABLE, ttu_attr->qos_ramp_disable_c);
+
+       REG_SET(DCN_SURF1_TTU_CNTL1, 0,
+               REFCYC_PER_REQ_DELIVERY_PRE,
+               ttu_attr->refcyc_per_req_delivery_pre_c);
+}
+
+static void hubp1_setup(
+               struct hubp *hubp,
+               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
+               struct _vcs_dpi_display_ttu_regs_st *ttu_attr,
+               struct _vcs_dpi_display_rq_regs_st *rq_regs,
+               struct _vcs_dpi_display_pipe_dest_params_st *pipe_dest)
+{
+       /* otg is locked when this func is called. Register are double buffered.
+        * disable the requestors is not needed
+        */
+       hubp1_program_requestor(hubp, rq_regs);
+       hubp1_program_deadline(hubp, dlg_attr, ttu_attr);
+       hubp1_vready_workaround(hubp, pipe_dest);
+}
+
+bool hubp1_is_flip_pending(struct hubp *hubp)
+{
+       uint32_t flip_pending = 0;
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       struct dc_plane_address earliest_inuse_address;
+
+       REG_GET(DCSURF_FLIP_CONTROL,
+                       SURFACE_FLIP_PENDING, &flip_pending);
+
+       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE,
+                       SURFACE_EARLIEST_INUSE_ADDRESS, &earliest_inuse_address.grph.addr.low_part);
+
+       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE_HIGH,
+                       SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, &earliest_inuse_address.grph.addr.high_part);
+
+       if (flip_pending)
+               return true;
+
+       if (earliest_inuse_address.grph.addr.quad_part != hubp->request_address.grph.addr.quad_part)
+               return true;
+
+       hubp->current_address = hubp->request_address;
+       return false;
+}
+
+uint32_t aperture_default_system = 1;
+uint32_t context0_default_system; /* = 0;*/
+
+static void hubp1_set_vm_system_aperture_settings(struct hubp *hubp,
+               struct vm_system_aperture_param *apt)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       PHYSICAL_ADDRESS_LOC mc_vm_apt_default;
+       PHYSICAL_ADDRESS_LOC mc_vm_apt_low;
+       PHYSICAL_ADDRESS_LOC mc_vm_apt_high;
+
+       mc_vm_apt_default.quad_part = apt->sys_default.quad_part >> 12;
+       mc_vm_apt_low.quad_part = apt->sys_low.quad_part >> 12;
+       mc_vm_apt_high.quad_part = apt->sys_high.quad_part >> 12;
+
+       REG_SET_2(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, 0,
+               MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM, aperture_default_system, /* 1 = system physical memory */
+               MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, mc_vm_apt_default.high_part);
+       REG_SET(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, 0,
+               MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, mc_vm_apt_default.low_part);
+
+       REG_SET(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, 0,
+                       MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, mc_vm_apt_low.high_part);
+       REG_SET(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, 0,
+                       MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, mc_vm_apt_low.low_part);
+
+       REG_SET(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, 0,
+                       MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, mc_vm_apt_high.high_part);
+       REG_SET(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, 0,
+                       MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, mc_vm_apt_high.low_part);
+}
+
+static void hubp1_set_vm_context0_settings(struct hubp *hubp,
+               const struct vm_context0_param *vm0)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       /* pte base */
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, vm0->pte_base.high_part);
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, vm0->pte_base.low_part);
+
+       /* pte start */
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, vm0->pte_start.high_part);
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, vm0->pte_start.low_part);
+
+       /* pte end */
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, vm0->pte_end.high_part);
+       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, 0,
+                       VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, vm0->pte_end.low_part);
+
+       /* fault handling */
+       REG_SET_2(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, 0,
+                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, vm0->fault_default.high_part,
+                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM, context0_default_system);
+       REG_SET(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, 0,
+                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, vm0->fault_default.low_part);
+
+       /* control: enable VM PTE*/
+       REG_SET_2(DCN_VM_MX_L1_TLB_CNTL, 0,
+                       ENABLE_L1_TLB, 1,
+                       SYSTEM_ACCESS_MODE, 3);
+}
+
+void min_set_viewport(
+       struct hubp *hubp,
+       const struct rect *viewport,
+       const struct rect *viewport_c)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+
+       REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION, 0,
+                 PRI_VIEWPORT_WIDTH, viewport->width,
+                 PRI_VIEWPORT_HEIGHT, viewport->height);
+
+       REG_SET_2(DCSURF_PRI_VIEWPORT_START, 0,
+                 PRI_VIEWPORT_X_START, viewport->x,
+                 PRI_VIEWPORT_Y_START, viewport->y);
+
+       /*for stereo*/
+       REG_SET_2(DCSURF_SEC_VIEWPORT_DIMENSION, 0,
+                 SEC_VIEWPORT_WIDTH, viewport->width,
+                 SEC_VIEWPORT_HEIGHT, viewport->height);
+
+       REG_SET_2(DCSURF_SEC_VIEWPORT_START, 0,
+                 SEC_VIEWPORT_X_START, viewport->x,
+                 SEC_VIEWPORT_Y_START, viewport->y);
+
+       /* DC supports NV12 only at the moment */
+       REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION_C, 0,
+                 PRI_VIEWPORT_WIDTH_C, viewport_c->width,
+                 PRI_VIEWPORT_HEIGHT_C, viewport_c->height);
+
+       REG_SET_2(DCSURF_PRI_VIEWPORT_START_C, 0,
+                 PRI_VIEWPORT_X_START_C, viewport_c->x,
+                 PRI_VIEWPORT_Y_START_C, viewport_c->y);
+}
+
+void hubp1_read_state(struct dcn10_hubp *hubp1,
+               struct dcn_hubp_state *s)
+{
+       REG_GET(DCSURF_SURFACE_CONFIG,
+                       SURFACE_PIXEL_FORMAT, &s->pixel_format);
+
+       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE_HIGH,
+                       SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, &s->inuse_addr_hi);
+
+       REG_GET_2(DCSURF_PRI_VIEWPORT_DIMENSION,
+                       PRI_VIEWPORT_WIDTH, &s->viewport_width,
+                       PRI_VIEWPORT_HEIGHT, &s->viewport_height);
+
+       REG_GET_2(DCSURF_SURFACE_CONFIG,
+                       ROTATION_ANGLE, &s->rotation_angle,
+                       H_MIRROR_EN, &s->h_mirror_en);
+
+       REG_GET(DCSURF_TILING_CONFIG,
+                       SW_MODE, &s->sw_mode);
+
+       REG_GET(DCSURF_SURFACE_CONTROL,
+                       PRIMARY_SURFACE_DCC_EN, &s->dcc_en);
+
+       REG_GET_3(DCHUBP_CNTL,
+                       HUBP_BLANK_EN, &s->blank_en,
+                       HUBP_TTU_DISABLE, &s->ttu_disable,
+                       HUBP_UNDERFLOW_STATUS, &s->underflow_status);
+
+       REG_GET(DCN_GLOBAL_TTU_CNTL,
+                       MIN_TTU_VBLANK, &s->min_ttu_vblank);
+
+       REG_GET_2(DCN_TTU_QOS_WM,
+                       QoS_LEVEL_LOW_WM, &s->qos_level_low_wm,
+                       QoS_LEVEL_HIGH_WM, &s->qos_level_high_wm);
+}
+
+enum cursor_pitch {
+       CURSOR_PITCH_64_PIXELS = 0,
+       CURSOR_PITCH_128_PIXELS,
+       CURSOR_PITCH_256_PIXELS
+};
+
+enum cursor_lines_per_chunk {
+       CURSOR_LINE_PER_CHUNK_2 = 1,
+       CURSOR_LINE_PER_CHUNK_4,
+       CURSOR_LINE_PER_CHUNK_8,
+       CURSOR_LINE_PER_CHUNK_16
+};
+
+static bool ippn10_cursor_program_control(
+               struct dcn10_hubp *hubp1,
+               bool pixel_data_invert,
+               enum dc_cursor_color_format color_format)
+{
+       if (REG(CURSOR_SETTINS))
+               REG_SET_2(CURSOR_SETTINS, 0,
+                               /* no shift of the cursor HDL schedule */
+                               CURSOR0_DST_Y_OFFSET, 0,
+                                /* used to shift the cursor chunk request deadline */
+                               CURSOR0_CHUNK_HDL_ADJUST, 3);
+       else
+               REG_SET_2(CURSOR_SETTINGS, 0,
+                               /* no shift of the cursor HDL schedule */
+                               CURSOR0_DST_Y_OFFSET, 0,
+                                /* used to shift the cursor chunk request deadline */
+                               CURSOR0_CHUNK_HDL_ADJUST, 3);
+
+       return true;
+}
+
+static enum cursor_pitch ippn10_get_cursor_pitch(
+               unsigned int pitch)
+{
+       enum cursor_pitch hw_pitch;
+
+       switch (pitch) {
+       case 64:
+               hw_pitch = CURSOR_PITCH_64_PIXELS;
+               break;
+       case 128:
+               hw_pitch = CURSOR_PITCH_128_PIXELS;
+               break;
+       case 256:
+               hw_pitch = CURSOR_PITCH_256_PIXELS;
+               break;
+       default:
+               DC_ERR("Invalid cursor pitch of %d. "
+                               "Only 64/128/256 is supported on DCN.\n", pitch);
+               hw_pitch = CURSOR_PITCH_64_PIXELS;
+               break;
+       }
+       return hw_pitch;
+}
+
+static enum cursor_lines_per_chunk ippn10_get_lines_per_chunk(
+               unsigned int cur_width,
+               enum dc_cursor_color_format format)
+{
+       enum cursor_lines_per_chunk line_per_chunk;
+
+       if (format == CURSOR_MODE_MONO)
+               /* impl B. expansion in CUR Buffer reader */
+               line_per_chunk = CURSOR_LINE_PER_CHUNK_16;
+       else if (cur_width <= 32)
+               line_per_chunk = CURSOR_LINE_PER_CHUNK_16;
+       else if (cur_width <= 64)
+               line_per_chunk = CURSOR_LINE_PER_CHUNK_8;
+       else if (cur_width <= 128)
+               line_per_chunk = CURSOR_LINE_PER_CHUNK_4;
+       else
+               line_per_chunk = CURSOR_LINE_PER_CHUNK_2;
+
+       return line_per_chunk;
+}
+
+void hubp1_cursor_set_attributes(
+               struct hubp *hubp,
+               const struct dc_cursor_attributes *attr)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       enum cursor_pitch hw_pitch = ippn10_get_cursor_pitch(attr->pitch);
+       enum cursor_lines_per_chunk lpc = ippn10_get_lines_per_chunk(
+                       attr->width, attr->color_format);
+
+       hubp->curs_attr = *attr;
+
+       REG_UPDATE(CURSOR_SURFACE_ADDRESS_HIGH,
+                       CURSOR_SURFACE_ADDRESS_HIGH, attr->address.high_part);
+       REG_UPDATE(CURSOR_SURFACE_ADDRESS,
+                       CURSOR_SURFACE_ADDRESS, attr->address.low_part);
+
+       REG_UPDATE_2(CURSOR_SIZE,
+                       CURSOR_WIDTH, attr->width,
+                       CURSOR_HEIGHT, attr->height);
+       REG_UPDATE_3(CURSOR_CONTROL,
+                       CURSOR_MODE, attr->color_format,
+                       CURSOR_PITCH, hw_pitch,
+                       CURSOR_LINES_PER_CHUNK, lpc);
+       ippn10_cursor_program_control(hubp1,
+                       attr->attribute_flags.bits.INVERT_PIXEL_DATA,
+                       attr->color_format);
+}
+
+void hubp1_cursor_set_position(
+               struct hubp *hubp,
+               const struct dc_cursor_position *pos,
+               const struct dc_cursor_mi_param *param)
+{
+       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
+       int src_x_offset = pos->x - pos->x_hotspot - param->viewport_x_start;
+       uint32_t cur_en = pos->enable ? 1 : 0;
+       uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0;
+
+       /*
+        * Guard aganst cursor_set_position() from being called with invalid
+        * attributes
+        *
+        * TODO: Look at combining cursor_set_position() and
+        * cursor_set_attributes() into cursor_update()
+        */
+       if (hubp->curs_attr.address.quad_part == 0)
+               return;
+
+       dst_x_offset *= param->ref_clk_khz;
+       dst_x_offset /= param->pixel_clk_khz;
+
+       ASSERT(param->h_scale_ratio.value);
+
+       if (param->h_scale_ratio.value)
+               dst_x_offset = dal_fixed31_32_floor(dal_fixed31_32_div(
+                               dal_fixed31_32_from_int(dst_x_offset),
+                               param->h_scale_ratio));
+
+       if (src_x_offset >= (int)param->viewport_width)
+               cur_en = 0;  /* not visible beyond right edge*/
+
+       if (src_x_offset + (int)hubp->curs_attr.width < 0)
+               cur_en = 0;  /* not visible beyond left edge*/
+
+       if (cur_en && REG_READ(CURSOR_SURFACE_ADDRESS) == 0)
+               hubp1_cursor_set_attributes(hubp, &hubp->curs_attr);
+       REG_UPDATE(CURSOR_CONTROL,
+                       CURSOR_ENABLE, cur_en);
+
+       REG_SET_2(CURSOR_POSITION, 0,
+                       CURSOR_X_POSITION, pos->x,
+                       CURSOR_Y_POSITION, pos->y);
+
+       REG_SET_2(CURSOR_HOT_SPOT, 0,
+                       CURSOR_HOT_SPOT_X, pos->x_hotspot,
+                       CURSOR_HOT_SPOT_Y, pos->y_hotspot);
+
+       REG_SET(CURSOR_DST_OFFSET, 0,
+                       CURSOR_DST_X_OFFSET, dst_x_offset);
+       /* TODO Handle surface pixel formats other than 4:4:4 */
+}
+
+static struct hubp_funcs dcn10_hubp_funcs = {
+       .hubp_program_surface_flip_and_addr =
+                       hubp1_program_surface_flip_and_addr,
+       .hubp_program_surface_config =
+                       hubp1_program_surface_config,
+       .hubp_is_flip_pending = hubp1_is_flip_pending,
+       .hubp_setup = hubp1_setup,
+       .hubp_set_vm_system_aperture_settings = hubp1_set_vm_system_aperture_settings,
+       .hubp_set_vm_context0_settings = hubp1_set_vm_context0_settings,
+       .set_blank = hubp1_set_blank,
+       .dcc_control = hubp1_dcc_control,
+       .mem_program_viewport = min_set_viewport,
+       .set_hubp_blank_en = hubp1_set_hubp_blank_en,
+       .set_cursor_attributes  = hubp1_cursor_set_attributes,
+       .set_cursor_position    = hubp1_cursor_set_position,
+};
+
+/*****************************************/
+/* Constructor, Destructor               */
+/*****************************************/
+
+void dcn10_hubp_construct(
+       struct dcn10_hubp *hubp1,
+       struct dc_context *ctx,
+       uint32_t inst,
+       const struct dcn_mi_registers *mi_regs,
+       const struct dcn_mi_shift *mi_shift,
+       const struct dcn_mi_mask *mi_mask)
+{
+       hubp1->base.funcs = &dcn10_hubp_funcs;
+       hubp1->base.ctx = ctx;
+       hubp1->mi_regs = mi_regs;
+       hubp1->mi_shift = mi_shift;
+       hubp1->mi_mask = mi_mask;
+       hubp1->base.inst = inst;
+       hubp1->base.opp_id = 0xf;
+       hubp1->base.mpcc_id = 0xf;
+}
+
+
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
new file mode 100644 (file)
index 0000000..66db453
--- /dev/null
@@ -0,0 +1,683 @@
+/* Copyright 2012-15 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+
+#ifndef __DC_MEM_INPUT_DCN10_H__
+#define __DC_MEM_INPUT_DCN10_H__
+
+#include "hubp.h"
+
+#define TO_DCN10_HUBP(hubp)\
+       container_of(hubp, struct dcn10_hubp, base)
+
+#define MI_REG_LIST_DCN(id)\
+       SRI(DCHUBP_CNTL, HUBP, id),\
+       SRI(HUBPREQ_DEBUG_DB, HUBP, id),\
+       SRI(DCSURF_ADDR_CONFIG, HUBP, id),\
+       SRI(DCSURF_TILING_CONFIG, HUBP, id),\
+       SRI(DCSURF_SURFACE_PITCH, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_PITCH_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_CONFIG, HUBP, id),\
+       SRI(DCSURF_FLIP_CONTROL, HUBPREQ, id),\
+       SRI(DCSURF_PRI_VIEWPORT_DIMENSION, HUBP, id), \
+       SRI(DCSURF_PRI_VIEWPORT_START, HUBP, id), \
+       SRI(DCSURF_SEC_VIEWPORT_DIMENSION, HUBP, id), \
+       SRI(DCSURF_SEC_VIEWPORT_START, HUBP, id), \
+       SRI(DCSURF_PRI_VIEWPORT_DIMENSION_C, HUBP, id), \
+       SRI(DCSURF_PRI_VIEWPORT_START_C, HUBP, id), \
+       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_C, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_INUSE, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_INUSE_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_INUSE_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_INUSE_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_EARLIEST_INUSE, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_EARLIEST_INUSE_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_SURFACE_CONTROL, HUBPREQ, id),\
+       SRI(HUBPRET_CONTROL, HUBPRET, id),\
+       SRI(DCN_EXPANSION_MODE, HUBPREQ, id),\
+       SRI(DCHUBP_REQ_SIZE_CONFIG, HUBP, id),\
+       SRI(DCHUBP_REQ_SIZE_CONFIG_C, HUBP, id),\
+       SRI(BLANK_OFFSET_0, HUBPREQ, id),\
+       SRI(BLANK_OFFSET_1, HUBPREQ, id),\
+       SRI(DST_DIMENSIONS, HUBPREQ, id),\
+       SRI(DST_AFTER_SCALER, HUBPREQ, id),\
+       SRI(VBLANK_PARAMETERS_0, HUBPREQ, id),\
+       SRI(REF_FREQ_TO_PIX_FREQ, HUBPREQ, id),\
+       SRI(VBLANK_PARAMETERS_1, HUBPREQ, id),\
+       SRI(VBLANK_PARAMETERS_3, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_0, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_1, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_4, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_5, HUBPREQ, id),\
+       SRI(PER_LINE_DELIVERY_PRE, HUBPREQ, id),\
+       SRI(PER_LINE_DELIVERY, HUBPREQ, id),\
+       SRI(VBLANK_PARAMETERS_2, HUBPREQ, id),\
+       SRI(VBLANK_PARAMETERS_4, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_2, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_3, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_6, HUBPREQ, id),\
+       SRI(NOM_PARAMETERS_7, HUBPREQ, id),\
+       SRI(DCN_TTU_QOS_WM, HUBPREQ, id),\
+       SRI(DCN_GLOBAL_TTU_CNTL, HUBPREQ, id),\
+       SRI(DCN_SURF0_TTU_CNTL0, HUBPREQ, id),\
+       SRI(DCN_SURF0_TTU_CNTL1, HUBPREQ, id),\
+       SRI(DCN_SURF1_TTU_CNTL0, HUBPREQ, id),\
+       SRI(DCN_SURF1_TTU_CNTL1, HUBPREQ, id),\
+       SRI(DCN_VM_MX_L1_TLB_CNTL, HUBPREQ, id)
+
+#define MI_REG_LIST_DCN10(id)\
+       MI_REG_LIST_DCN(id),\
+       SRI(PREFETCH_SETTINS, HUBPREQ, id),\
+       SRI(PREFETCH_SETTINS_C, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, HUBPREQ, id),\
+       SRI(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, HUBPREQ, id),\
+       SR(DCHUBBUB_SDPIF_FB_BASE),\
+       SR(DCHUBBUB_SDPIF_FB_OFFSET),\
+       SRI(CURSOR_SETTINS, HUBPREQ, id), \
+       SRI(CURSOR_SURFACE_ADDRESS_HIGH, CURSOR, id), \
+       SRI(CURSOR_SURFACE_ADDRESS, CURSOR, id), \
+       SRI(CURSOR_SIZE, CURSOR, id), \
+       SRI(CURSOR_CONTROL, CURSOR, id), \
+       SRI(CURSOR_POSITION, CURSOR, id), \
+       SRI(CURSOR_HOT_SPOT, CURSOR, id), \
+       SRI(CURSOR_DST_OFFSET, CURSOR, id)
+
+
+
+struct dcn_mi_registers {
+       uint32_t DCHUBP_CNTL;
+       uint32_t HUBPREQ_DEBUG_DB;
+       uint32_t DCSURF_ADDR_CONFIG;
+       uint32_t DCSURF_TILING_CONFIG;
+       uint32_t DCSURF_SURFACE_PITCH;
+       uint32_t DCSURF_SURFACE_PITCH_C;
+       uint32_t DCSURF_SURFACE_CONFIG;
+       uint32_t DCSURF_FLIP_CONTROL;
+       uint32_t DCSURF_PRI_VIEWPORT_DIMENSION;
+       uint32_t DCSURF_PRI_VIEWPORT_START;
+       uint32_t DCSURF_SEC_VIEWPORT_DIMENSION;
+       uint32_t DCSURF_SEC_VIEWPORT_START;
+       uint32_t DCSURF_PRI_VIEWPORT_DIMENSION_C;
+       uint32_t DCSURF_PRI_VIEWPORT_START_C;
+       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH;
+       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS;
+       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH;
+       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS;
+       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH;
+       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS;
+       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH;
+       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS;
+       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C;
+       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_C;
+       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C;
+       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_C;
+       uint32_t DCSURF_SURFACE_INUSE;
+       uint32_t DCSURF_SURFACE_INUSE_HIGH;
+       uint32_t DCSURF_SURFACE_INUSE_C;
+       uint32_t DCSURF_SURFACE_INUSE_HIGH_C;
+       uint32_t DCSURF_SURFACE_EARLIEST_INUSE;
+       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH;
+       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_C;
+       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C;
+       uint32_t DCSURF_SURFACE_CONTROL;
+       uint32_t HUBPRET_CONTROL;
+       uint32_t DCN_EXPANSION_MODE;
+       uint32_t DCHUBP_REQ_SIZE_CONFIG;
+       uint32_t DCHUBP_REQ_SIZE_CONFIG_C;
+       uint32_t BLANK_OFFSET_0;
+       uint32_t BLANK_OFFSET_1;
+       uint32_t DST_DIMENSIONS;
+       uint32_t DST_AFTER_SCALER;
+       uint32_t PREFETCH_SETTINS;
+       uint32_t PREFETCH_SETTINGS;
+       uint32_t VBLANK_PARAMETERS_0;
+       uint32_t REF_FREQ_TO_PIX_FREQ;
+       uint32_t VBLANK_PARAMETERS_1;
+       uint32_t VBLANK_PARAMETERS_3;
+       uint32_t NOM_PARAMETERS_0;
+       uint32_t NOM_PARAMETERS_1;
+       uint32_t NOM_PARAMETERS_4;
+       uint32_t NOM_PARAMETERS_5;
+       uint32_t PER_LINE_DELIVERY_PRE;
+       uint32_t PER_LINE_DELIVERY;
+       uint32_t PREFETCH_SETTINS_C;
+       uint32_t PREFETCH_SETTINGS_C;
+       uint32_t VBLANK_PARAMETERS_2;
+       uint32_t VBLANK_PARAMETERS_4;
+       uint32_t NOM_PARAMETERS_2;
+       uint32_t NOM_PARAMETERS_3;
+       uint32_t NOM_PARAMETERS_6;
+       uint32_t NOM_PARAMETERS_7;
+       uint32_t DCN_TTU_QOS_WM;
+       uint32_t DCN_GLOBAL_TTU_CNTL;
+       uint32_t DCN_SURF0_TTU_CNTL0;
+       uint32_t DCN_SURF0_TTU_CNTL1;
+       uint32_t DCN_SURF1_TTU_CNTL0;
+       uint32_t DCN_SURF1_TTU_CNTL1;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB;
+       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB;
+       uint32_t DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB;
+       uint32_t DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB;
+       uint32_t DCN_VM_MX_L1_TLB_CNTL;
+       uint32_t DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB;
+       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR;
+       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR;
+       uint32_t DCHUBBUB_SDPIF_FB_BASE;
+       uint32_t DCHUBBUB_SDPIF_FB_OFFSET;
+       uint32_t DCN_VM_FB_LOCATION_TOP;
+       uint32_t DCN_VM_FB_LOCATION_BASE;
+       uint32_t DCN_VM_FB_OFFSET;
+       uint32_t DCN_VM_AGP_BASE;
+       uint32_t DCN_VM_AGP_BOT;
+       uint32_t DCN_VM_AGP_TOP;
+       uint32_t CURSOR_SETTINS;
+       uint32_t CURSOR_SETTINGS;
+       uint32_t CURSOR_SURFACE_ADDRESS_HIGH;
+       uint32_t CURSOR_SURFACE_ADDRESS;
+       uint32_t CURSOR_SIZE;
+       uint32_t CURSOR_CONTROL;
+       uint32_t CURSOR_POSITION;
+       uint32_t CURSOR_HOT_SPOT;
+       uint32_t CURSOR_DST_OFFSET;
+};
+
+#define MI_SF(reg_name, field_name, post_fix)\
+       .field_name = reg_name ## __ ## field_name ## post_fix
+
+#define MI_MASK_SH_LIST_DCN(mask_sh)\
+       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_BLANK_EN, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_TTU_DISABLE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_UNDERFLOW_STATUS, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_NO_OUTSTANDING_REQ, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_PIPES, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_BANKS, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, PIPE_INTERLEAVE, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_SE, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_RB_PER_SE, mask_sh),\
+       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, MAX_COMPRESSED_FRAGS, mask_sh),\
+       MI_SF(HUBP0_DCSURF_TILING_CONFIG, SW_MODE, mask_sh),\
+       MI_SF(HUBP0_DCSURF_TILING_CONFIG, META_LINEAR, mask_sh),\
+       MI_SF(HUBP0_DCSURF_TILING_CONFIG, RB_ALIGNED, mask_sh),\
+       MI_SF(HUBP0_DCSURF_TILING_CONFIG, PIPE_ALIGNED, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH, PITCH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH, META_PITCH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH_C, PITCH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH_C, META_PITCH_C, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, ROTATION_ANGLE, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, H_MIRROR_EN, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, SURFACE_PIXEL_FORMAT, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_FLIP_TYPE, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_FLIP_PENDING, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_UPDATE_LOCK, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION, PRI_VIEWPORT_WIDTH, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION, PRI_VIEWPORT_HEIGHT, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START, PRI_VIEWPORT_X_START, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START, PRI_VIEWPORT_Y_START, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION, SEC_VIEWPORT_WIDTH, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION, SEC_VIEWPORT_HEIGHT, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_START, SEC_VIEWPORT_X_START, mask_sh),\
+       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_START, SEC_VIEWPORT_Y_START, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C, PRI_VIEWPORT_WIDTH_C, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C, PRI_VIEWPORT_HEIGHT_C, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_X_START_C, mask_sh),\
+       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_Y_START_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, PRIMARY_SURFACE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS, PRIMARY_SURFACE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, SECONDARY_SURFACE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS, SECONDARY_SURFACE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, PRIMARY_META_SURFACE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS, PRIMARY_META_SURFACE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, SECONDARY_META_SURFACE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS, SECONDARY_META_SURFACE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, PRIMARY_SURFACE_ADDRESS_HIGH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_C, PRIMARY_SURFACE_ADDRESS_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, PRIMARY_META_SURFACE_ADDRESS_HIGH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, PRIMARY_META_SURFACE_ADDRESS_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE, SURFACE_INUSE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH, SURFACE_INUSE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_C, SURFACE_INUSE_ADDRESS_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH_C, SURFACE_INUSE_ADDRESS_HIGH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE, SURFACE_EARLIEST_INUSE_ADDRESS, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_C, SURFACE_EARLIEST_INUSE_ADDRESS_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_TMZ, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_EN, mask_sh),\
+       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_IND_64B_BLK, mask_sh),\
+       MI_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\
+       MI_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CB_B, mask_sh),\
+       MI_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CR_R, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, DRQ_EXPANSION_MODE, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, PRQ_EXPANSION_MODE, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, MRQ_EXPANSION_MODE, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, CRQ_EXPANSION_MODE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, CHUNK_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MIN_CHUNK_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, META_CHUNK_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MIN_META_CHUNK_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, DPTE_GROUP_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MPTE_GROUP_SIZE, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, SWATH_HEIGHT, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, PTE_ROW_HEIGHT_LINEAR, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, CHUNK_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MIN_CHUNK_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, META_CHUNK_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MIN_META_CHUNK_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, DPTE_GROUP_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MPTE_GROUP_SIZE_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, SWATH_HEIGHT_C, mask_sh),\
+       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, PTE_ROW_HEIGHT_LINEAR_C, mask_sh),\
+       MI_SF(HUBPREQ0_BLANK_OFFSET_0, REFCYC_H_BLANK_END, mask_sh),\
+       MI_SF(HUBPREQ0_BLANK_OFFSET_0, DLG_V_BLANK_END, mask_sh),\
+       MI_SF(HUBPREQ0_BLANK_OFFSET_1, MIN_DST_Y_NEXT_START, mask_sh),\
+       MI_SF(HUBPREQ0_DST_DIMENSIONS, REFCYC_PER_HTOTAL, mask_sh),\
+       MI_SF(HUBPREQ0_DST_AFTER_SCALER, REFCYC_X_AFTER_SCALER, mask_sh),\
+       MI_SF(HUBPREQ0_DST_AFTER_SCALER, DST_Y_AFTER_SCALER, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_0, DST_Y_PER_VM_VBLANK, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_0, DST_Y_PER_ROW_VBLANK, mask_sh),\
+       MI_SF(HUBPREQ0_REF_FREQ_TO_PIX_FREQ, REF_FREQ_TO_PIX_FREQ, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_1, REFCYC_PER_PTE_GROUP_VBLANK_L, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_3, REFCYC_PER_META_CHUNK_VBLANK_L, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_0, DST_Y_PER_PTE_ROW_NOM_L, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_1, REFCYC_PER_PTE_GROUP_NOM_L, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_4, DST_Y_PER_META_ROW_NOM_L, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_5, REFCYC_PER_META_CHUNK_NOM_L, mask_sh),\
+       MI_SF(HUBPREQ0_PER_LINE_DELIVERY_PRE, REFCYC_PER_LINE_DELIVERY_PRE_L, mask_sh),\
+       MI_SF(HUBPREQ0_PER_LINE_DELIVERY_PRE, REFCYC_PER_LINE_DELIVERY_PRE_C, mask_sh),\
+       MI_SF(HUBPREQ0_PER_LINE_DELIVERY, REFCYC_PER_LINE_DELIVERY_L, mask_sh),\
+       MI_SF(HUBPREQ0_PER_LINE_DELIVERY, REFCYC_PER_LINE_DELIVERY_C, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_2, REFCYC_PER_PTE_GROUP_VBLANK_C, mask_sh),\
+       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_4, REFCYC_PER_META_CHUNK_VBLANK_C, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_2, DST_Y_PER_PTE_ROW_NOM_C, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_3, REFCYC_PER_PTE_GROUP_NOM_C, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_6, DST_Y_PER_META_ROW_NOM_C, mask_sh),\
+       MI_SF(HUBPREQ0_NOM_PARAMETERS_7, REFCYC_PER_META_CHUNK_NOM_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_TTU_QOS_WM, QoS_LEVEL_LOW_WM, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_TTU_QOS_WM, QoS_LEVEL_HIGH_WM, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_GLOBAL_TTU_CNTL, MIN_TTU_VBLANK, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_GLOBAL_TTU_CNTL, QoS_LEVEL_FLIP, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, REFCYC_PER_REQ_DELIVERY, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, QoS_LEVEL_FIXED, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, QoS_RAMP_DISABLE, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL1, REFCYC_PER_REQ_DELIVERY_PRE, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_MX_L1_TLB_CNTL, ENABLE_L1_TLB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_MX_L1_TLB_CNTL, SYSTEM_ACCESS_MODE, mask_sh)
+
+#define MI_MASK_SH_LIST_DCN10(mask_sh)\
+       MI_MASK_SH_LIST_DCN(mask_sh),\
+       MI_SF(HUBPREQ0_PREFETCH_SETTINS, DST_Y_PREFETCH, mask_sh),\
+       MI_SF(HUBPREQ0_PREFETCH_SETTINS, VRATIO_PREFETCH, mask_sh),\
+       MI_SF(HUBPREQ0_PREFETCH_SETTINS_C, VRATIO_PREFETCH_C, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, mask_sh),\
+       MI_SF(DCHUBBUB_SDPIF_FB_BASE, SDPIF_FB_BASE, mask_sh),\
+       MI_SF(DCHUBBUB_SDPIF_FB_OFFSET, SDPIF_FB_OFFSET, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, mask_sh),\
+       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, mask_sh),\
+       MI_SF(HUBPREQ0_CURSOR_SETTINS, CURSOR0_DST_Y_OFFSET, mask_sh), \
+       MI_SF(HUBPREQ0_CURSOR_SETTINS, CURSOR0_CHUNK_HDL_ADJUST, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_SURFACE_ADDRESS_HIGH, CURSOR_SURFACE_ADDRESS_HIGH, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_SURFACE_ADDRESS, CURSOR_SURFACE_ADDRESS, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_SIZE, CURSOR_WIDTH, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_SIZE, CURSOR_HEIGHT, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_MODE, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_2X_MAGNIFY, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_PITCH, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_LINES_PER_CHUNK, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_ENABLE, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_POSITION, CURSOR_X_POSITION, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_POSITION, CURSOR_Y_POSITION, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_X, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \
+       MI_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh)
+
+#define DCN_MI_REG_FIELD_LIST(type) \
+       type HUBP_BLANK_EN;\
+       type HUBP_TTU_DISABLE;\
+       type HUBP_NO_OUTSTANDING_REQ;\
+       type HUBP_UNDERFLOW_STATUS;\
+       type NUM_PIPES;\
+       type NUM_BANKS;\
+       type PIPE_INTERLEAVE;\
+       type NUM_SE;\
+       type NUM_RB_PER_SE;\
+       type MAX_COMPRESSED_FRAGS;\
+       type SW_MODE;\
+       type META_LINEAR;\
+       type RB_ALIGNED;\
+       type PIPE_ALIGNED;\
+       type PITCH;\
+       type META_PITCH;\
+       type PITCH_C;\
+       type META_PITCH_C;\
+       type ROTATION_ANGLE;\
+       type H_MIRROR_EN;\
+       type SURFACE_PIXEL_FORMAT;\
+       type SURFACE_FLIP_TYPE;\
+       type SURFACE_UPDATE_LOCK;\
+       type SURFACE_FLIP_PENDING;\
+       type PRI_VIEWPORT_WIDTH; \
+       type PRI_VIEWPORT_HEIGHT; \
+       type PRI_VIEWPORT_X_START; \
+       type PRI_VIEWPORT_Y_START; \
+       type SEC_VIEWPORT_WIDTH; \
+       type SEC_VIEWPORT_HEIGHT; \
+       type SEC_VIEWPORT_X_START; \
+       type SEC_VIEWPORT_Y_START; \
+       type PRI_VIEWPORT_WIDTH_C; \
+       type PRI_VIEWPORT_HEIGHT_C; \
+       type PRI_VIEWPORT_X_START_C; \
+       type PRI_VIEWPORT_Y_START_C; \
+       type PRIMARY_SURFACE_ADDRESS_HIGH;\
+       type PRIMARY_SURFACE_ADDRESS;\
+       type SECONDARY_SURFACE_ADDRESS_HIGH;\
+       type SECONDARY_SURFACE_ADDRESS;\
+       type PRIMARY_META_SURFACE_ADDRESS_HIGH;\
+       type PRIMARY_META_SURFACE_ADDRESS;\
+       type SECONDARY_META_SURFACE_ADDRESS_HIGH;\
+       type SECONDARY_META_SURFACE_ADDRESS;\
+       type PRIMARY_SURFACE_ADDRESS_HIGH_C;\
+       type PRIMARY_SURFACE_ADDRESS_C;\
+       type PRIMARY_META_SURFACE_ADDRESS_HIGH_C;\
+       type PRIMARY_META_SURFACE_ADDRESS_C;\
+       type SURFACE_INUSE_ADDRESS;\
+       type SURFACE_INUSE_ADDRESS_HIGH;\
+       type SURFACE_INUSE_ADDRESS_C;\
+       type SURFACE_INUSE_ADDRESS_HIGH_C;\
+       type SURFACE_EARLIEST_INUSE_ADDRESS;\
+       type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH;\
+       type SURFACE_EARLIEST_INUSE_ADDRESS_C;\
+       type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C;\
+       type PRIMARY_SURFACE_TMZ;\
+       type PRIMARY_SURFACE_DCC_EN;\
+       type PRIMARY_SURFACE_DCC_IND_64B_BLK;\
+       type DET_BUF_PLANE1_BASE_ADDRESS;\
+       type CROSSBAR_SRC_CB_B;\
+       type CROSSBAR_SRC_CR_R;\
+       type DRQ_EXPANSION_MODE;\
+       type PRQ_EXPANSION_MODE;\
+       type MRQ_EXPANSION_MODE;\
+       type CRQ_EXPANSION_MODE;\
+       type CHUNK_SIZE;\
+       type MIN_CHUNK_SIZE;\
+       type META_CHUNK_SIZE;\
+       type MIN_META_CHUNK_SIZE;\
+       type DPTE_GROUP_SIZE;\
+       type MPTE_GROUP_SIZE;\
+       type SWATH_HEIGHT;\
+       type PTE_ROW_HEIGHT_LINEAR;\
+       type CHUNK_SIZE_C;\
+       type MIN_CHUNK_SIZE_C;\
+       type META_CHUNK_SIZE_C;\
+       type MIN_META_CHUNK_SIZE_C;\
+       type DPTE_GROUP_SIZE_C;\
+       type MPTE_GROUP_SIZE_C;\
+       type SWATH_HEIGHT_C;\
+       type PTE_ROW_HEIGHT_LINEAR_C;\
+       type REFCYC_H_BLANK_END;\
+       type DLG_V_BLANK_END;\
+       type MIN_DST_Y_NEXT_START;\
+       type REFCYC_PER_HTOTAL;\
+       type REFCYC_X_AFTER_SCALER;\
+       type DST_Y_AFTER_SCALER;\
+       type DST_Y_PREFETCH;\
+       type VRATIO_PREFETCH;\
+       type DST_Y_PER_VM_VBLANK;\
+       type DST_Y_PER_ROW_VBLANK;\
+       type REF_FREQ_TO_PIX_FREQ;\
+       type REFCYC_PER_PTE_GROUP_VBLANK_L;\
+       type REFCYC_PER_META_CHUNK_VBLANK_L;\
+       type DST_Y_PER_PTE_ROW_NOM_L;\
+       type REFCYC_PER_PTE_GROUP_NOM_L;\
+       type DST_Y_PER_META_ROW_NOM_L;\
+       type REFCYC_PER_META_CHUNK_NOM_L;\
+       type REFCYC_PER_LINE_DELIVERY_PRE_L;\
+       type REFCYC_PER_LINE_DELIVERY_PRE_C;\
+       type REFCYC_PER_LINE_DELIVERY_L;\
+       type REFCYC_PER_LINE_DELIVERY_C;\
+       type VRATIO_PREFETCH_C;\
+       type REFCYC_PER_PTE_GROUP_VBLANK_C;\
+       type REFCYC_PER_META_CHUNK_VBLANK_C;\
+       type DST_Y_PER_PTE_ROW_NOM_C;\
+       type REFCYC_PER_PTE_GROUP_NOM_C;\
+       type DST_Y_PER_META_ROW_NOM_C;\
+       type REFCYC_PER_META_CHUNK_NOM_C;\
+       type QoS_LEVEL_LOW_WM;\
+       type QoS_LEVEL_HIGH_WM;\
+       type MIN_TTU_VBLANK;\
+       type QoS_LEVEL_FLIP;\
+       type REFCYC_PER_REQ_DELIVERY;\
+       type QoS_LEVEL_FIXED;\
+       type QoS_RAMP_DISABLE;\
+       type REFCYC_PER_REQ_DELIVERY_PRE;\
+       type VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB;\
+       type VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB;\
+       type VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB;\
+       type VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB;\
+       type VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB;\
+       type VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB;\
+       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB;\
+       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM;\
+       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB;\
+       type ENABLE_L1_TLB;\
+       type SYSTEM_ACCESS_MODE;\
+       type MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM;\
+       type MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB;\
+       type MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB;\
+       type MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB;\
+       type MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB;\
+       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB;\
+       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB;\
+       type MC_VM_SYSTEM_APERTURE_LOW_ADDR;\
+       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR;\
+       type SDPIF_FB_TOP;\
+       type SDPIF_FB_BASE;\
+       type SDPIF_FB_OFFSET;\
+       type SDPIF_AGP_BASE;\
+       type SDPIF_AGP_BOT;\
+       type SDPIF_AGP_TOP;\
+       type FB_TOP;\
+       type FB_BASE;\
+       type FB_OFFSET;\
+       type AGP_BASE;\
+       type AGP_BOT;\
+       type AGP_TOP;\
+       /* todo:  get these from GVM instead of reading registers ourselves */\
+       type PAGE_DIRECTORY_ENTRY_HI32;\
+       type PAGE_DIRECTORY_ENTRY_LO32;\
+       type LOGICAL_PAGE_NUMBER_HI4;\
+       type LOGICAL_PAGE_NUMBER_LO32;\
+       type PHYSICAL_PAGE_ADDR_HI4;\
+       type PHYSICAL_PAGE_ADDR_LO32;\
+       type PHYSICAL_PAGE_NUMBER_MSB;\
+       type PHYSICAL_PAGE_NUMBER_LSB;\
+       type LOGICAL_ADDR;\
+       type CURSOR0_DST_Y_OFFSET; \
+       type CURSOR0_CHUNK_HDL_ADJUST; \
+       type CURSOR_SURFACE_ADDRESS_HIGH; \
+       type CURSOR_SURFACE_ADDRESS; \
+       type CURSOR_WIDTH; \
+       type CURSOR_HEIGHT; \
+       type CURSOR_MODE; \
+       type CURSOR_2X_MAGNIFY; \
+       type CURSOR_PITCH; \
+       type CURSOR_LINES_PER_CHUNK; \
+       type CURSOR_ENABLE; \
+       type CURSOR_X_POSITION; \
+       type CURSOR_Y_POSITION; \
+       type CURSOR_HOT_SPOT_X; \
+       type CURSOR_HOT_SPOT_Y; \
+       type CURSOR_DST_X_OFFSET; \
+       type OUTPUT_FP
+
+struct dcn_mi_shift {
+       DCN_MI_REG_FIELD_LIST(uint8_t);
+};
+
+struct dcn_mi_mask {
+       DCN_MI_REG_FIELD_LIST(uint32_t);
+};
+
+struct dcn10_hubp {
+       struct hubp base;
+       const struct dcn_mi_registers *mi_regs;
+       const struct dcn_mi_shift *mi_shift;
+       const struct dcn_mi_mask *mi_mask;
+};
+
+void hubp1_program_surface_config(
+       struct hubp *hubp,
+       enum surface_pixel_format format,
+       union dc_tiling_info *tiling_info,
+       union plane_size *plane_size,
+       enum dc_rotation_angle rotation,
+       struct dc_plane_dcc_param *dcc,
+       bool horizontal_mirror);
+
+void hubp1_program_deadline(
+               struct hubp *hubp,
+               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
+               struct _vcs_dpi_display_ttu_regs_st *ttu_attr);
+
+void hubp1_program_requestor(
+               struct hubp *hubp,
+               struct _vcs_dpi_display_rq_regs_st *rq_regs);
+
+void hubp1_program_pixel_format(
+       struct dcn10_hubp *hubp,
+       enum surface_pixel_format format);
+
+void hubp1_program_size_and_rotation(
+       struct dcn10_hubp *hubp,
+       enum dc_rotation_angle rotation,
+       enum surface_pixel_format format,
+       const union plane_size *plane_size,
+       struct dc_plane_dcc_param *dcc,
+       bool horizontal_mirror);
+
+void hubp1_program_tiling(
+       struct dcn10_hubp *hubp,
+       const union dc_tiling_info *info,
+       const enum surface_pixel_format pixel_format);
+
+void hubp1_dcc_control(struct hubp *hubp,
+               bool enable,
+               bool independent_64b_blks);
+
+bool hubp1_program_surface_flip_and_addr(
+       struct hubp *hubp,
+       const struct dc_plane_address *address,
+       bool flip_immediate);
+
+bool hubp1_is_flip_pending(struct hubp *hubp);
+
+void hubp1_cursor_set_attributes(
+               struct hubp *hubp,
+               const struct dc_cursor_attributes *attr);
+
+void hubp1_cursor_set_position(
+               struct hubp *hubp,
+               const struct dc_cursor_position *pos,
+               const struct dc_cursor_mi_param *param);
+
+void hubp1_set_blank(struct hubp *hubp, bool blank);
+
+void min_set_viewport(struct hubp *hubp,
+               const struct rect *viewport,
+               const struct rect *viewport_c);
+
+void dcn10_hubp_construct(
+       struct dcn10_hubp *hubp1,
+       struct dc_context *ctx,
+       uint32_t inst,
+       const struct dcn_mi_registers *mi_regs,
+       const struct dcn_mi_shift *mi_shift,
+       const struct dcn_mi_mask *mi_mask);
+
+
+struct dcn_hubp_state {
+       uint32_t pixel_format;
+       uint32_t inuse_addr_hi;
+       uint32_t viewport_width;
+       uint32_t viewport_height;
+       uint32_t rotation_angle;
+       uint32_t h_mirror_en;
+       uint32_t sw_mode;
+       uint32_t dcc_en;
+       uint32_t blank_en;
+       uint32_t underflow_status;
+       uint32_t ttu_disable;
+       uint32_t min_ttu_vblank;
+       uint32_t qos_level_low_wm;
+       uint32_t qos_level_high_wm;
+};
+void hubp1_read_state(struct dcn10_hubp *hubp1,
+               struct dcn_hubp_state *s);
+
+#endif
index 059da7882a68a11e809fd8c8be21a801ee933ffd..6b866b16998593459d01421356ee7f397a33f4ed 100644 (file)
@@ -31,7 +31,6 @@
 #include "dce110/dce110_hw_sequencer.h"
 #include "dce/dce_hwseq.h"
 #include "abm.h"
-#include "dcn10/dcn10_mem_input.h"
 #include "dcn10/dcn10_timing_generator.h"
 #include "dcn10/dcn10_dpp.h"
 #include "dcn10/dcn10_mpc.h"
@@ -41,6 +40,7 @@
 #include "mpc.h"
 #include "reg_helper.h"
 #include "custom_float.h"
+#include "dcn10_hubp.h"
 
 #define CTX \
        hws->ctx
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c
deleted file mode 100644 (file)
index 9ee42d9..0000000
+++ /dev/null
@@ -1,960 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-#include "dm_services.h"
-#include "dce_calcs.h"
-#include "dcn10_mem_input.h"
-#include "reg_helper.h"
-#include "basics/conversion.h"
-
-#define REG(reg)\
-       hubp1->mi_regs->reg
-
-#define CTX \
-       hubp1->base.ctx
-
-#undef FN
-#define FN(reg_name, field_name) \
-       hubp1->mi_shift->field_name, hubp1->mi_mask->field_name
-
-void hubp1_set_blank(struct hubp *hubp, bool blank)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       uint32_t blank_en = blank ? 1 : 0;
-
-       REG_UPDATE_2(DCHUBP_CNTL,
-                       HUBP_BLANK_EN, blank_en,
-                       HUBP_TTU_DISABLE, blank_en);
-
-       if (blank) {
-               REG_WAIT(DCHUBP_CNTL,
-                               HUBP_NO_OUTSTANDING_REQ, 1,
-                               1, 200);
-               hubp->mpcc_id = 0xf;
-               hubp->opp_id = 0xf;
-       }
-}
-
-static void hubp1_set_hubp_blank_en(struct hubp *hubp, bool blank)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       uint32_t blank_en = blank ? 1 : 0;
-
-       REG_UPDATE(DCHUBP_CNTL, HUBP_BLANK_EN, blank_en);
-}
-
-static void hubp1_vready_workaround(struct hubp *hubp,
-               struct _vcs_dpi_display_pipe_dest_params_st *pipe_dest)
-{
-       uint32_t value = 0;
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       /* set HBUBREQ_DEBUG_DB[12] = 1 */
-       value = REG_READ(HUBPREQ_DEBUG_DB);
-
-       /* hack mode disable */
-       value |= 0x100;
-       value &= ~0x1000;
-
-       if ((pipe_dest->vstartup_start - 2*(pipe_dest->vready_offset+pipe_dest->vupdate_width
-               + pipe_dest->vupdate_offset) / pipe_dest->htotal) <= pipe_dest->vblank_end) {
-               /* if (eco_fix_needed(otg_global_sync_timing)
-                * set HBUBREQ_DEBUG_DB[12] = 1 */
-               value |= 0x1000;
-       }
-
-       REG_WRITE(HUBPREQ_DEBUG_DB, value);
-}
-
-void hubp1_program_tiling(
-       struct dcn10_hubp *hubp1,
-       const union dc_tiling_info *info,
-       const enum surface_pixel_format pixel_format)
-{
-       REG_UPDATE_6(DCSURF_ADDR_CONFIG,
-                       NUM_PIPES, log_2(info->gfx9.num_pipes),
-                       NUM_BANKS, log_2(info->gfx9.num_banks),
-                       PIPE_INTERLEAVE, info->gfx9.pipe_interleave,
-                       NUM_SE, log_2(info->gfx9.num_shader_engines),
-                       NUM_RB_PER_SE, log_2(info->gfx9.num_rb_per_se),
-                       MAX_COMPRESSED_FRAGS, log_2(info->gfx9.max_compressed_frags));
-
-       REG_UPDATE_4(DCSURF_TILING_CONFIG,
-                       SW_MODE, info->gfx9.swizzle,
-                       META_LINEAR, info->gfx9.meta_linear,
-                       RB_ALIGNED, info->gfx9.rb_aligned,
-                       PIPE_ALIGNED, info->gfx9.pipe_aligned);
-}
-
-void hubp1_program_size_and_rotation(
-       struct dcn10_hubp *hubp1,
-       enum dc_rotation_angle rotation,
-       enum surface_pixel_format format,
-       const union plane_size *plane_size,
-       struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror)
-{
-       uint32_t pitch, meta_pitch, pitch_c, meta_pitch_c, mirror;
-
-       /* Program data and meta surface pitch (calculation from addrlib)
-        * 444 or 420 luma
-        */
-       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
-               pitch = plane_size->video.luma_pitch - 1;
-               meta_pitch = dcc->video.meta_pitch_l - 1;
-               pitch_c = plane_size->video.chroma_pitch - 1;
-               meta_pitch_c = dcc->video.meta_pitch_c - 1;
-       } else {
-               pitch = plane_size->grph.surface_pitch - 1;
-               meta_pitch = dcc->grph.meta_pitch - 1;
-               pitch_c = 0;
-               meta_pitch_c = 0;
-       }
-
-       if (!dcc->enable) {
-               meta_pitch = 0;
-               meta_pitch_c = 0;
-       }
-
-       REG_UPDATE_2(DCSURF_SURFACE_PITCH,
-                       PITCH, pitch, META_PITCH, meta_pitch);
-
-       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
-               REG_UPDATE_2(DCSURF_SURFACE_PITCH_C,
-                       PITCH_C, pitch_c, META_PITCH_C, meta_pitch_c);
-
-       if (horizontal_mirror)
-               mirror = 1;
-       else
-               mirror = 0;
-
-
-       /* Program rotation angle and horz mirror - no mirror */
-       if (rotation == ROTATION_ANGLE_0)
-               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
-                               ROTATION_ANGLE, 0,
-                               H_MIRROR_EN, mirror);
-       else if (rotation == ROTATION_ANGLE_90)
-               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
-                               ROTATION_ANGLE, 1,
-                               H_MIRROR_EN, mirror);
-       else if (rotation == ROTATION_ANGLE_180)
-               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
-                               ROTATION_ANGLE, 2,
-                               H_MIRROR_EN, mirror);
-       else if (rotation == ROTATION_ANGLE_270)
-               REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
-                               ROTATION_ANGLE, 3,
-                               H_MIRROR_EN, mirror);
-}
-
-void hubp1_program_pixel_format(
-       struct dcn10_hubp *hubp1,
-       enum surface_pixel_format format)
-{
-       uint32_t red_bar = 3;
-       uint32_t blue_bar = 2;
-
-       /* swap for ABGR format */
-       if (format == SURFACE_PIXEL_FORMAT_GRPH_ABGR8888
-                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010
-                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS
-                       || format == SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616F) {
-               red_bar = 2;
-               blue_bar = 3;
-       }
-
-       REG_UPDATE_2(HUBPRET_CONTROL,
-                       CROSSBAR_SRC_CB_B, blue_bar,
-                       CROSSBAR_SRC_CR_R, red_bar);
-
-       /* Mapping is same as ipp programming (cnvc) */
-
-       switch (format) {
-       case SURFACE_PIXEL_FORMAT_GRPH_ARGB1555:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 1);
-               break;
-       case SURFACE_PIXEL_FORMAT_GRPH_RGB565:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 3);
-               break;
-       case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 8);
-               break;
-       case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:
-       case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:
-       case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 10);
-               break;
-       case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 22);
-               break;
-       case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616F:
-       case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616F:/*we use crossbar already*/
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 24);
-               break;
-
-       case SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 65);
-               break;
-       case SURFACE_PIXEL_FORMAT_VIDEO_420_YCrCb:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 64);
-               break;
-       case SURFACE_PIXEL_FORMAT_VIDEO_420_10bpc_YCbCr:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 67);
-               break;
-       case SURFACE_PIXEL_FORMAT_VIDEO_420_10bpc_YCrCb:
-               REG_UPDATE(DCSURF_SURFACE_CONFIG,
-                               SURFACE_PIXEL_FORMAT, 66);
-               break;
-       default:
-               BREAK_TO_DEBUGGER();
-               break;
-       }
-
-       /* don't see the need of program the xbar in DCN 1.0 */
-}
-
-bool hubp1_program_surface_flip_and_addr(
-       struct hubp *hubp,
-       const struct dc_plane_address *address,
-       bool flip_immediate)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       /* program flip type */
-       REG_SET(DCSURF_FLIP_CONTROL, 0,
-                       SURFACE_FLIP_TYPE, flip_immediate);
-
-       /* HW automatically latch rest of address register on write to
-        * DCSURF_PRIMARY_SURFACE_ADDRESS if SURFACE_UPDATE_LOCK is not used
-        *
-        * program high first and then the low addr, order matters!
-        */
-       switch (address->type) {
-       case PLN_ADDR_TYPE_GRAPHICS:
-               /* DCN1.0 does not support const color
-                * TODO: program DCHUBBUB_RET_PATH_DCC_CFGx_0/1
-                * base on address->grph.dcc_const_color
-                * x = 0, 2, 4, 6 for pipe 0, 1, 2, 3 for rgb and luma
-                * x = 1, 3, 5, 7 for pipe 0, 1, 2, 3 for chroma
-                */
-
-               if (address->grph.addr.quad_part == 0)
-                       break;
-
-               REG_UPDATE(DCSURF_SURFACE_CONTROL,
-                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
-
-               if (address->grph.meta_addr.quad_part != 0) {
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
-                                       PRIMARY_META_SURFACE_ADDRESS_HIGH,
-                                       address->grph.meta_addr.high_part);
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
-                                       PRIMARY_META_SURFACE_ADDRESS,
-                                       address->grph.meta_addr.low_part);
-               }
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
-                               PRIMARY_SURFACE_ADDRESS_HIGH,
-                               address->grph.addr.high_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
-                               PRIMARY_SURFACE_ADDRESS,
-                               address->grph.addr.low_part);
-               break;
-       case PLN_ADDR_TYPE_VIDEO_PROGRESSIVE:
-               if (address->video_progressive.luma_addr.quad_part == 0
-                       || address->video_progressive.chroma_addr.quad_part == 0)
-                       break;
-
-               REG_UPDATE(DCSURF_SURFACE_CONTROL,
-                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
-
-               if (address->video_progressive.luma_meta_addr.quad_part != 0) {
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, 0,
-                               PRIMARY_META_SURFACE_ADDRESS_HIGH_C,
-                               address->video_progressive.chroma_meta_addr.high_part);
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, 0,
-                               PRIMARY_META_SURFACE_ADDRESS_C,
-                               address->video_progressive.chroma_meta_addr.low_part);
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
-                               PRIMARY_META_SURFACE_ADDRESS_HIGH,
-                               address->video_progressive.luma_meta_addr.high_part);
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
-                               PRIMARY_META_SURFACE_ADDRESS,
-                               address->video_progressive.luma_meta_addr.low_part);
-               }
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, 0,
-                       PRIMARY_SURFACE_ADDRESS_HIGH_C,
-                       address->video_progressive.chroma_addr.high_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_C, 0,
-                       PRIMARY_SURFACE_ADDRESS_C,
-                       address->video_progressive.chroma_addr.low_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
-                       PRIMARY_SURFACE_ADDRESS_HIGH,
-                       address->video_progressive.luma_addr.high_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
-                       PRIMARY_SURFACE_ADDRESS,
-                       address->video_progressive.luma_addr.low_part);
-               break;
-       case PLN_ADDR_TYPE_GRPH_STEREO:
-               if (address->grph_stereo.left_addr.quad_part == 0)
-                       break;
-               if (address->grph_stereo.right_addr.quad_part == 0)
-                       break;
-
-               REG_UPDATE(DCSURF_SURFACE_CONTROL,
-                               PRIMARY_SURFACE_TMZ, address->tmz_surface);
-
-               if (address->grph_stereo.right_meta_addr.quad_part != 0) {
-
-                       REG_SET(DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, 0,
-                                       SECONDARY_META_SURFACE_ADDRESS_HIGH,
-                                       address->grph_stereo.right_meta_addr.high_part);
-
-                       REG_SET(DCSURF_SECONDARY_META_SURFACE_ADDRESS, 0,
-                                       SECONDARY_META_SURFACE_ADDRESS,
-                                       address->grph_stereo.right_meta_addr.low_part);
-               }
-               if (address->grph_stereo.left_meta_addr.quad_part != 0) {
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, 0,
-                                       PRIMARY_META_SURFACE_ADDRESS_HIGH,
-                                       address->grph_stereo.left_meta_addr.high_part);
-
-                       REG_SET(DCSURF_PRIMARY_META_SURFACE_ADDRESS, 0,
-                                       PRIMARY_META_SURFACE_ADDRESS,
-                                       address->grph_stereo.left_meta_addr.low_part);
-               }
-
-               REG_SET(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, 0,
-                               SECONDARY_SURFACE_ADDRESS_HIGH,
-                               address->grph_stereo.right_addr.high_part);
-
-               REG_SET(DCSURF_SECONDARY_SURFACE_ADDRESS, 0,
-                               SECONDARY_SURFACE_ADDRESS,
-                               address->grph_stereo.right_addr.low_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, 0,
-                               PRIMARY_SURFACE_ADDRESS_HIGH,
-                               address->grph_stereo.left_addr.high_part);
-
-               REG_SET(DCSURF_PRIMARY_SURFACE_ADDRESS, 0,
-                               PRIMARY_SURFACE_ADDRESS,
-                               address->grph_stereo.left_addr.low_part);
-               break;
-       default:
-               BREAK_TO_DEBUGGER();
-               break;
-       }
-
-       hubp->request_address = *address;
-
-       if (flip_immediate)
-               hubp->current_address = *address;
-
-       return true;
-}
-
-void hubp1_dcc_control(struct hubp *hubp, bool enable,
-               bool independent_64b_blks)
-{
-       uint32_t dcc_en = enable ? 1 : 0;
-       uint32_t dcc_ind_64b_blk = independent_64b_blks ? 1 : 0;
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       REG_UPDATE_2(DCSURF_SURFACE_CONTROL,
-                       PRIMARY_SURFACE_DCC_EN, dcc_en,
-                       PRIMARY_SURFACE_DCC_IND_64B_BLK, dcc_ind_64b_blk);
-}
-
-void hubp1_program_surface_config(
-       struct hubp *hubp,
-       enum surface_pixel_format format,
-       union dc_tiling_info *tiling_info,
-       union plane_size *plane_size,
-       enum dc_rotation_angle rotation,
-       struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       hubp1_dcc_control(hubp, dcc->enable, dcc->grph.independent_64b_blks);
-       hubp1_program_tiling(hubp1, tiling_info, format);
-       hubp1_program_size_and_rotation(
-                       hubp1, rotation, format, plane_size, dcc, horizontal_mirror);
-       hubp1_program_pixel_format(hubp1, format);
-}
-
-void hubp1_program_requestor(
-               struct hubp *hubp,
-               struct _vcs_dpi_display_rq_regs_st *rq_regs)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       REG_UPDATE(HUBPRET_CONTROL,
-                       DET_BUF_PLANE1_BASE_ADDRESS, rq_regs->plane1_base_address);
-       REG_SET_4(DCN_EXPANSION_MODE, 0,
-                       DRQ_EXPANSION_MODE, rq_regs->drq_expansion_mode,
-                       PRQ_EXPANSION_MODE, rq_regs->prq_expansion_mode,
-                       MRQ_EXPANSION_MODE, rq_regs->mrq_expansion_mode,
-                       CRQ_EXPANSION_MODE, rq_regs->crq_expansion_mode);
-       REG_SET_8(DCHUBP_REQ_SIZE_CONFIG, 0,
-               CHUNK_SIZE, rq_regs->rq_regs_l.chunk_size,
-               MIN_CHUNK_SIZE, rq_regs->rq_regs_l.min_chunk_size,
-               META_CHUNK_SIZE, rq_regs->rq_regs_l.meta_chunk_size,
-               MIN_META_CHUNK_SIZE, rq_regs->rq_regs_l.min_meta_chunk_size,
-               DPTE_GROUP_SIZE, rq_regs->rq_regs_l.dpte_group_size,
-               MPTE_GROUP_SIZE, rq_regs->rq_regs_l.mpte_group_size,
-               SWATH_HEIGHT, rq_regs->rq_regs_l.swath_height,
-               PTE_ROW_HEIGHT_LINEAR, rq_regs->rq_regs_l.pte_row_height_linear);
-       REG_SET_8(DCHUBP_REQ_SIZE_CONFIG_C, 0,
-               CHUNK_SIZE_C, rq_regs->rq_regs_c.chunk_size,
-               MIN_CHUNK_SIZE_C, rq_regs->rq_regs_c.min_chunk_size,
-               META_CHUNK_SIZE_C, rq_regs->rq_regs_c.meta_chunk_size,
-               MIN_META_CHUNK_SIZE_C, rq_regs->rq_regs_c.min_meta_chunk_size,
-               DPTE_GROUP_SIZE_C, rq_regs->rq_regs_c.dpte_group_size,
-               MPTE_GROUP_SIZE_C, rq_regs->rq_regs_c.mpte_group_size,
-               SWATH_HEIGHT_C, rq_regs->rq_regs_c.swath_height,
-               PTE_ROW_HEIGHT_LINEAR_C, rq_regs->rq_regs_c.pte_row_height_linear);
-}
-
-
-void hubp1_program_deadline(
-               struct hubp *hubp,
-               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
-               struct _vcs_dpi_display_ttu_regs_st *ttu_attr)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       /* DLG - Per hubp */
-       REG_SET_2(BLANK_OFFSET_0, 0,
-               REFCYC_H_BLANK_END, dlg_attr->refcyc_h_blank_end,
-               DLG_V_BLANK_END, dlg_attr->dlg_vblank_end);
-
-       REG_SET(BLANK_OFFSET_1, 0,
-               MIN_DST_Y_NEXT_START, dlg_attr->min_dst_y_next_start);
-
-       REG_SET(DST_DIMENSIONS, 0,
-               REFCYC_PER_HTOTAL, dlg_attr->refcyc_per_htotal);
-
-       REG_SET_2(DST_AFTER_SCALER, 0,
-               REFCYC_X_AFTER_SCALER, dlg_attr->refcyc_x_after_scaler,
-               DST_Y_AFTER_SCALER, dlg_attr->dst_y_after_scaler);
-
-       if (REG(PREFETCH_SETTINS))
-               REG_SET_2(PREFETCH_SETTINS, 0,
-                       DST_Y_PREFETCH, dlg_attr->dst_y_prefetch,
-                       VRATIO_PREFETCH, dlg_attr->vratio_prefetch);
-       else
-               REG_SET_2(PREFETCH_SETTINGS, 0,
-                       DST_Y_PREFETCH, dlg_attr->dst_y_prefetch,
-                       VRATIO_PREFETCH, dlg_attr->vratio_prefetch);
-
-       REG_SET_2(VBLANK_PARAMETERS_0, 0,
-               DST_Y_PER_VM_VBLANK, dlg_attr->dst_y_per_vm_vblank,
-               DST_Y_PER_ROW_VBLANK, dlg_attr->dst_y_per_row_vblank);
-
-       REG_SET(REF_FREQ_TO_PIX_FREQ, 0,
-               REF_FREQ_TO_PIX_FREQ, dlg_attr->ref_freq_to_pix_freq);
-
-       /* DLG - Per luma/chroma */
-       REG_SET(VBLANK_PARAMETERS_1, 0,
-               REFCYC_PER_PTE_GROUP_VBLANK_L, dlg_attr->refcyc_per_pte_group_vblank_l);
-
-       REG_SET(VBLANK_PARAMETERS_3, 0,
-               REFCYC_PER_META_CHUNK_VBLANK_L, dlg_attr->refcyc_per_meta_chunk_vblank_l);
-
-       REG_SET(NOM_PARAMETERS_0, 0,
-               DST_Y_PER_PTE_ROW_NOM_L, dlg_attr->dst_y_per_pte_row_nom_l);
-
-       REG_SET(NOM_PARAMETERS_1, 0,
-               REFCYC_PER_PTE_GROUP_NOM_L, dlg_attr->refcyc_per_pte_group_nom_l);
-
-       REG_SET(NOM_PARAMETERS_4, 0,
-               DST_Y_PER_META_ROW_NOM_L, dlg_attr->dst_y_per_meta_row_nom_l);
-
-       REG_SET(NOM_PARAMETERS_5, 0,
-               REFCYC_PER_META_CHUNK_NOM_L, dlg_attr->refcyc_per_meta_chunk_nom_l);
-
-       REG_SET_2(PER_LINE_DELIVERY_PRE, 0,
-               REFCYC_PER_LINE_DELIVERY_PRE_L, dlg_attr->refcyc_per_line_delivery_pre_l,
-               REFCYC_PER_LINE_DELIVERY_PRE_C, dlg_attr->refcyc_per_line_delivery_pre_c);
-
-       REG_SET_2(PER_LINE_DELIVERY, 0,
-               REFCYC_PER_LINE_DELIVERY_L, dlg_attr->refcyc_per_line_delivery_l,
-               REFCYC_PER_LINE_DELIVERY_C, dlg_attr->refcyc_per_line_delivery_c);
-
-       if (REG(PREFETCH_SETTINS_C))
-               REG_SET(PREFETCH_SETTINS_C, 0,
-                       VRATIO_PREFETCH_C, dlg_attr->vratio_prefetch_c);
-       else
-               REG_SET(PREFETCH_SETTINGS_C, 0,
-                       VRATIO_PREFETCH_C, dlg_attr->vratio_prefetch_c);
-
-       REG_SET(VBLANK_PARAMETERS_2, 0,
-               REFCYC_PER_PTE_GROUP_VBLANK_C, dlg_attr->refcyc_per_pte_group_vblank_c);
-
-       REG_SET(VBLANK_PARAMETERS_4, 0,
-               REFCYC_PER_META_CHUNK_VBLANK_C, dlg_attr->refcyc_per_meta_chunk_vblank_c);
-
-       REG_SET(NOM_PARAMETERS_2, 0,
-               DST_Y_PER_PTE_ROW_NOM_C, dlg_attr->dst_y_per_pte_row_nom_c);
-
-       REG_SET(NOM_PARAMETERS_3, 0,
-               REFCYC_PER_PTE_GROUP_NOM_C, dlg_attr->refcyc_per_pte_group_nom_c);
-
-       REG_SET(NOM_PARAMETERS_6, 0,
-               DST_Y_PER_META_ROW_NOM_C, dlg_attr->dst_y_per_meta_row_nom_c);
-
-       REG_SET(NOM_PARAMETERS_7, 0,
-               REFCYC_PER_META_CHUNK_NOM_C, dlg_attr->refcyc_per_meta_chunk_nom_c);
-
-       /* TTU - per hubp */
-       REG_SET_2(DCN_TTU_QOS_WM, 0,
-               QoS_LEVEL_LOW_WM, ttu_attr->qos_level_low_wm,
-               QoS_LEVEL_HIGH_WM, ttu_attr->qos_level_high_wm);
-
-       REG_SET_2(DCN_GLOBAL_TTU_CNTL, 0,
-               MIN_TTU_VBLANK, ttu_attr->min_ttu_vblank,
-               QoS_LEVEL_FLIP, ttu_attr->qos_level_flip);
-
-       /* TTU - per luma/chroma */
-       /* Assumed surf0 is luma and 1 is chroma */
-
-       REG_SET_3(DCN_SURF0_TTU_CNTL0, 0,
-               REFCYC_PER_REQ_DELIVERY, ttu_attr->refcyc_per_req_delivery_l,
-               QoS_LEVEL_FIXED, ttu_attr->qos_level_fixed_l,
-               QoS_RAMP_DISABLE, ttu_attr->qos_ramp_disable_l);
-
-       REG_SET(DCN_SURF0_TTU_CNTL1, 0,
-               REFCYC_PER_REQ_DELIVERY_PRE,
-               ttu_attr->refcyc_per_req_delivery_pre_l);
-
-       REG_SET_3(DCN_SURF1_TTU_CNTL0, 0,
-               REFCYC_PER_REQ_DELIVERY, ttu_attr->refcyc_per_req_delivery_c,
-               QoS_LEVEL_FIXED, ttu_attr->qos_level_fixed_c,
-               QoS_RAMP_DISABLE, ttu_attr->qos_ramp_disable_c);
-
-       REG_SET(DCN_SURF1_TTU_CNTL1, 0,
-               REFCYC_PER_REQ_DELIVERY_PRE,
-               ttu_attr->refcyc_per_req_delivery_pre_c);
-}
-
-static void hubp1_setup(
-               struct hubp *hubp,
-               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
-               struct _vcs_dpi_display_ttu_regs_st *ttu_attr,
-               struct _vcs_dpi_display_rq_regs_st *rq_regs,
-               struct _vcs_dpi_display_pipe_dest_params_st *pipe_dest)
-{
-       /* otg is locked when this func is called. Register are double buffered.
-        * disable the requestors is not needed
-        */
-       hubp1_program_requestor(hubp, rq_regs);
-       hubp1_program_deadline(hubp, dlg_attr, ttu_attr);
-       hubp1_vready_workaround(hubp, pipe_dest);
-}
-
-bool hubp1_is_flip_pending(struct hubp *hubp)
-{
-       uint32_t flip_pending = 0;
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       struct dc_plane_address earliest_inuse_address;
-
-       REG_GET(DCSURF_FLIP_CONTROL,
-                       SURFACE_FLIP_PENDING, &flip_pending);
-
-       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE,
-                       SURFACE_EARLIEST_INUSE_ADDRESS, &earliest_inuse_address.grph.addr.low_part);
-
-       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE_HIGH,
-                       SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, &earliest_inuse_address.grph.addr.high_part);
-
-       if (flip_pending)
-               return true;
-
-       if (earliest_inuse_address.grph.addr.quad_part != hubp->request_address.grph.addr.quad_part)
-               return true;
-
-       hubp->current_address = hubp->request_address;
-       return false;
-}
-
-uint32_t aperture_default_system = 1;
-uint32_t context0_default_system; /* = 0;*/
-
-static void hubp1_set_vm_system_aperture_settings(struct hubp *hubp,
-               struct vm_system_aperture_param *apt)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       PHYSICAL_ADDRESS_LOC mc_vm_apt_default;
-       PHYSICAL_ADDRESS_LOC mc_vm_apt_low;
-       PHYSICAL_ADDRESS_LOC mc_vm_apt_high;
-
-       mc_vm_apt_default.quad_part = apt->sys_default.quad_part >> 12;
-       mc_vm_apt_low.quad_part = apt->sys_low.quad_part >> 12;
-       mc_vm_apt_high.quad_part = apt->sys_high.quad_part >> 12;
-
-       REG_SET_2(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, 0,
-               MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM, aperture_default_system, /* 1 = system physical memory */
-               MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, mc_vm_apt_default.high_part);
-       REG_SET(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, 0,
-               MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, mc_vm_apt_default.low_part);
-
-       REG_SET(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, 0,
-                       MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, mc_vm_apt_low.high_part);
-       REG_SET(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, 0,
-                       MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, mc_vm_apt_low.low_part);
-
-       REG_SET(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, 0,
-                       MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, mc_vm_apt_high.high_part);
-       REG_SET(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, 0,
-                       MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, mc_vm_apt_high.low_part);
-}
-
-static void hubp1_set_vm_context0_settings(struct hubp *hubp,
-               const struct vm_context0_param *vm0)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       /* pte base */
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, vm0->pte_base.high_part);
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, vm0->pte_base.low_part);
-
-       /* pte start */
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, vm0->pte_start.high_part);
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, vm0->pte_start.low_part);
-
-       /* pte end */
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, vm0->pte_end.high_part);
-       REG_SET(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, 0,
-                       VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, vm0->pte_end.low_part);
-
-       /* fault handling */
-       REG_SET_2(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, 0,
-                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, vm0->fault_default.high_part,
-                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM, context0_default_system);
-       REG_SET(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, 0,
-                       VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, vm0->fault_default.low_part);
-
-       /* control: enable VM PTE*/
-       REG_SET_2(DCN_VM_MX_L1_TLB_CNTL, 0,
-                       ENABLE_L1_TLB, 1,
-                       SYSTEM_ACCESS_MODE, 3);
-}
-
-void min_set_viewport(
-       struct hubp *hubp,
-       const struct rect *viewport,
-       const struct rect *viewport_c)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-
-       REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION, 0,
-                 PRI_VIEWPORT_WIDTH, viewport->width,
-                 PRI_VIEWPORT_HEIGHT, viewport->height);
-
-       REG_SET_2(DCSURF_PRI_VIEWPORT_START, 0,
-                 PRI_VIEWPORT_X_START, viewport->x,
-                 PRI_VIEWPORT_Y_START, viewport->y);
-
-       /*for stereo*/
-       REG_SET_2(DCSURF_SEC_VIEWPORT_DIMENSION, 0,
-                 SEC_VIEWPORT_WIDTH, viewport->width,
-                 SEC_VIEWPORT_HEIGHT, viewport->height);
-
-       REG_SET_2(DCSURF_SEC_VIEWPORT_START, 0,
-                 SEC_VIEWPORT_X_START, viewport->x,
-                 SEC_VIEWPORT_Y_START, viewport->y);
-
-       /* DC supports NV12 only at the moment */
-       REG_SET_2(DCSURF_PRI_VIEWPORT_DIMENSION_C, 0,
-                 PRI_VIEWPORT_WIDTH_C, viewport_c->width,
-                 PRI_VIEWPORT_HEIGHT_C, viewport_c->height);
-
-       REG_SET_2(DCSURF_PRI_VIEWPORT_START_C, 0,
-                 PRI_VIEWPORT_X_START_C, viewport_c->x,
-                 PRI_VIEWPORT_Y_START_C, viewport_c->y);
-}
-
-void hubp1_read_state(struct dcn10_hubp *hubp1,
-               struct dcn_hubp_state *s)
-{
-       REG_GET(DCSURF_SURFACE_CONFIG,
-                       SURFACE_PIXEL_FORMAT, &s->pixel_format);
-
-       REG_GET(DCSURF_SURFACE_EARLIEST_INUSE_HIGH,
-                       SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, &s->inuse_addr_hi);
-
-       REG_GET_2(DCSURF_PRI_VIEWPORT_DIMENSION,
-                       PRI_VIEWPORT_WIDTH, &s->viewport_width,
-                       PRI_VIEWPORT_HEIGHT, &s->viewport_height);
-
-       REG_GET_2(DCSURF_SURFACE_CONFIG,
-                       ROTATION_ANGLE, &s->rotation_angle,
-                       H_MIRROR_EN, &s->h_mirror_en);
-
-       REG_GET(DCSURF_TILING_CONFIG,
-                       SW_MODE, &s->sw_mode);
-
-       REG_GET(DCSURF_SURFACE_CONTROL,
-                       PRIMARY_SURFACE_DCC_EN, &s->dcc_en);
-
-       REG_GET_3(DCHUBP_CNTL,
-                       HUBP_BLANK_EN, &s->blank_en,
-                       HUBP_TTU_DISABLE, &s->ttu_disable,
-                       HUBP_UNDERFLOW_STATUS, &s->underflow_status);
-
-       REG_GET(DCN_GLOBAL_TTU_CNTL,
-                       MIN_TTU_VBLANK, &s->min_ttu_vblank);
-
-       REG_GET_2(DCN_TTU_QOS_WM,
-                       QoS_LEVEL_LOW_WM, &s->qos_level_low_wm,
-                       QoS_LEVEL_HIGH_WM, &s->qos_level_high_wm);
-}
-
-enum cursor_pitch {
-       CURSOR_PITCH_64_PIXELS = 0,
-       CURSOR_PITCH_128_PIXELS,
-       CURSOR_PITCH_256_PIXELS
-};
-
-enum cursor_lines_per_chunk {
-       CURSOR_LINE_PER_CHUNK_2 = 1,
-       CURSOR_LINE_PER_CHUNK_4,
-       CURSOR_LINE_PER_CHUNK_8,
-       CURSOR_LINE_PER_CHUNK_16
-};
-
-static bool ippn10_cursor_program_control(
-               struct dcn10_hubp *hubp1,
-               bool pixel_data_invert,
-               enum dc_cursor_color_format color_format)
-{
-       if (REG(CURSOR_SETTINS))
-               REG_SET_2(CURSOR_SETTINS, 0,
-                               /* no shift of the cursor HDL schedule */
-                               CURSOR0_DST_Y_OFFSET, 0,
-                                /* used to shift the cursor chunk request deadline */
-                               CURSOR0_CHUNK_HDL_ADJUST, 3);
-       else
-               REG_SET_2(CURSOR_SETTINGS, 0,
-                               /* no shift of the cursor HDL schedule */
-                               CURSOR0_DST_Y_OFFSET, 0,
-                                /* used to shift the cursor chunk request deadline */
-                               CURSOR0_CHUNK_HDL_ADJUST, 3);
-
-       return true;
-}
-
-static enum cursor_pitch ippn10_get_cursor_pitch(
-               unsigned int pitch)
-{
-       enum cursor_pitch hw_pitch;
-
-       switch (pitch) {
-       case 64:
-               hw_pitch = CURSOR_PITCH_64_PIXELS;
-               break;
-       case 128:
-               hw_pitch = CURSOR_PITCH_128_PIXELS;
-               break;
-       case 256:
-               hw_pitch = CURSOR_PITCH_256_PIXELS;
-               break;
-       default:
-               DC_ERR("Invalid cursor pitch of %d. "
-                               "Only 64/128/256 is supported on DCN.\n", pitch);
-               hw_pitch = CURSOR_PITCH_64_PIXELS;
-               break;
-       }
-       return hw_pitch;
-}
-
-static enum cursor_lines_per_chunk ippn10_get_lines_per_chunk(
-               unsigned int cur_width,
-               enum dc_cursor_color_format format)
-{
-       enum cursor_lines_per_chunk line_per_chunk;
-
-       if (format == CURSOR_MODE_MONO)
-               /* impl B. expansion in CUR Buffer reader */
-               line_per_chunk = CURSOR_LINE_PER_CHUNK_16;
-       else if (cur_width <= 32)
-               line_per_chunk = CURSOR_LINE_PER_CHUNK_16;
-       else if (cur_width <= 64)
-               line_per_chunk = CURSOR_LINE_PER_CHUNK_8;
-       else if (cur_width <= 128)
-               line_per_chunk = CURSOR_LINE_PER_CHUNK_4;
-       else
-               line_per_chunk = CURSOR_LINE_PER_CHUNK_2;
-
-       return line_per_chunk;
-}
-
-void hubp1_cursor_set_attributes(
-               struct hubp *hubp,
-               const struct dc_cursor_attributes *attr)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       enum cursor_pitch hw_pitch = ippn10_get_cursor_pitch(attr->pitch);
-       enum cursor_lines_per_chunk lpc = ippn10_get_lines_per_chunk(
-                       attr->width, attr->color_format);
-
-       hubp->curs_attr = *attr;
-
-       REG_UPDATE(CURSOR_SURFACE_ADDRESS_HIGH,
-                       CURSOR_SURFACE_ADDRESS_HIGH, attr->address.high_part);
-       REG_UPDATE(CURSOR_SURFACE_ADDRESS,
-                       CURSOR_SURFACE_ADDRESS, attr->address.low_part);
-
-       REG_UPDATE_2(CURSOR_SIZE,
-                       CURSOR_WIDTH, attr->width,
-                       CURSOR_HEIGHT, attr->height);
-       REG_UPDATE_3(CURSOR_CONTROL,
-                       CURSOR_MODE, attr->color_format,
-                       CURSOR_PITCH, hw_pitch,
-                       CURSOR_LINES_PER_CHUNK, lpc);
-       ippn10_cursor_program_control(hubp1,
-                       attr->attribute_flags.bits.INVERT_PIXEL_DATA,
-                       attr->color_format);
-}
-
-void hubp1_cursor_set_position(
-               struct hubp *hubp,
-               const struct dc_cursor_position *pos,
-               const struct dc_cursor_mi_param *param)
-{
-       struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
-       int src_x_offset = pos->x - pos->x_hotspot - param->viewport_x_start;
-       uint32_t cur_en = pos->enable ? 1 : 0;
-       uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0;
-
-       /*
-        * Guard aganst cursor_set_position() from being called with invalid
-        * attributes
-        *
-        * TODO: Look at combining cursor_set_position() and
-        * cursor_set_attributes() into cursor_update()
-        */
-       if (hubp->curs_attr.address.quad_part == 0)
-               return;
-
-       dst_x_offset *= param->ref_clk_khz;
-       dst_x_offset /= param->pixel_clk_khz;
-
-       ASSERT(param->h_scale_ratio.value);
-
-       if (param->h_scale_ratio.value)
-               dst_x_offset = dal_fixed31_32_floor(dal_fixed31_32_div(
-                               dal_fixed31_32_from_int(dst_x_offset),
-                               param->h_scale_ratio));
-
-       if (src_x_offset >= (int)param->viewport_width)
-               cur_en = 0;  /* not visible beyond right edge*/
-
-       if (src_x_offset + (int)hubp->curs_attr.width < 0)
-               cur_en = 0;  /* not visible beyond left edge*/
-
-       if (cur_en && REG_READ(CURSOR_SURFACE_ADDRESS) == 0)
-               hubp1_cursor_set_attributes(hubp, &hubp->curs_attr);
-       REG_UPDATE(CURSOR_CONTROL,
-                       CURSOR_ENABLE, cur_en);
-
-       REG_SET_2(CURSOR_POSITION, 0,
-                       CURSOR_X_POSITION, pos->x,
-                       CURSOR_Y_POSITION, pos->y);
-
-       REG_SET_2(CURSOR_HOT_SPOT, 0,
-                       CURSOR_HOT_SPOT_X, pos->x_hotspot,
-                       CURSOR_HOT_SPOT_Y, pos->y_hotspot);
-
-       REG_SET(CURSOR_DST_OFFSET, 0,
-                       CURSOR_DST_X_OFFSET, dst_x_offset);
-       /* TODO Handle surface pixel formats other than 4:4:4 */
-}
-
-static struct hubp_funcs dcn10_hubp_funcs = {
-       .hubp_program_surface_flip_and_addr =
-                       hubp1_program_surface_flip_and_addr,
-       .hubp_program_surface_config =
-                       hubp1_program_surface_config,
-       .hubp_is_flip_pending = hubp1_is_flip_pending,
-       .hubp_setup = hubp1_setup,
-       .hubp_set_vm_system_aperture_settings = hubp1_set_vm_system_aperture_settings,
-       .hubp_set_vm_context0_settings = hubp1_set_vm_context0_settings,
-       .set_blank = hubp1_set_blank,
-       .dcc_control = hubp1_dcc_control,
-       .mem_program_viewport = min_set_viewport,
-       .set_hubp_blank_en = hubp1_set_hubp_blank_en,
-       .set_cursor_attributes  = hubp1_cursor_set_attributes,
-       .set_cursor_position    = hubp1_cursor_set_position,
-};
-
-/*****************************************/
-/* Constructor, Destructor               */
-/*****************************************/
-
-void dcn10_hubp_construct(
-       struct dcn10_hubp *hubp1,
-       struct dc_context *ctx,
-       uint32_t inst,
-       const struct dcn_mi_registers *mi_regs,
-       const struct dcn_mi_shift *mi_shift,
-       const struct dcn_mi_mask *mi_mask)
-{
-       hubp1->base.funcs = &dcn10_hubp_funcs;
-       hubp1->base.ctx = ctx;
-       hubp1->mi_regs = mi_regs;
-       hubp1->mi_shift = mi_shift;
-       hubp1->mi_mask = mi_mask;
-       hubp1->base.inst = inst;
-       hubp1->base.opp_id = 0xf;
-       hubp1->base.mpcc_id = 0xf;
-}
-
-
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h
deleted file mode 100644 (file)
index 66db453..0000000
+++ /dev/null
@@ -1,683 +0,0 @@
-/* Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_MEM_INPUT_DCN10_H__
-#define __DC_MEM_INPUT_DCN10_H__
-
-#include "hubp.h"
-
-#define TO_DCN10_HUBP(hubp)\
-       container_of(hubp, struct dcn10_hubp, base)
-
-#define MI_REG_LIST_DCN(id)\
-       SRI(DCHUBP_CNTL, HUBP, id),\
-       SRI(HUBPREQ_DEBUG_DB, HUBP, id),\
-       SRI(DCSURF_ADDR_CONFIG, HUBP, id),\
-       SRI(DCSURF_TILING_CONFIG, HUBP, id),\
-       SRI(DCSURF_SURFACE_PITCH, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_PITCH_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_CONFIG, HUBP, id),\
-       SRI(DCSURF_FLIP_CONTROL, HUBPREQ, id),\
-       SRI(DCSURF_PRI_VIEWPORT_DIMENSION, HUBP, id), \
-       SRI(DCSURF_PRI_VIEWPORT_START, HUBP, id), \
-       SRI(DCSURF_SEC_VIEWPORT_DIMENSION, HUBP, id), \
-       SRI(DCSURF_SEC_VIEWPORT_START, HUBP, id), \
-       SRI(DCSURF_PRI_VIEWPORT_DIMENSION_C, HUBP, id), \
-       SRI(DCSURF_PRI_VIEWPORT_START_C, HUBP, id), \
-       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS, HUBPREQ, id),\
-       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS, HUBPREQ, id),\
-       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_C, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
-       SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_INUSE, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_INUSE_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_INUSE_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_INUSE_HIGH_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_EARLIEST_INUSE, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_EARLIEST_INUSE_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, HUBPREQ, id),\
-       SRI(DCSURF_SURFACE_CONTROL, HUBPREQ, id),\
-       SRI(HUBPRET_CONTROL, HUBPRET, id),\
-       SRI(DCN_EXPANSION_MODE, HUBPREQ, id),\
-       SRI(DCHUBP_REQ_SIZE_CONFIG, HUBP, id),\
-       SRI(DCHUBP_REQ_SIZE_CONFIG_C, HUBP, id),\
-       SRI(BLANK_OFFSET_0, HUBPREQ, id),\
-       SRI(BLANK_OFFSET_1, HUBPREQ, id),\
-       SRI(DST_DIMENSIONS, HUBPREQ, id),\
-       SRI(DST_AFTER_SCALER, HUBPREQ, id),\
-       SRI(VBLANK_PARAMETERS_0, HUBPREQ, id),\
-       SRI(REF_FREQ_TO_PIX_FREQ, HUBPREQ, id),\
-       SRI(VBLANK_PARAMETERS_1, HUBPREQ, id),\
-       SRI(VBLANK_PARAMETERS_3, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_0, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_1, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_4, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_5, HUBPREQ, id),\
-       SRI(PER_LINE_DELIVERY_PRE, HUBPREQ, id),\
-       SRI(PER_LINE_DELIVERY, HUBPREQ, id),\
-       SRI(VBLANK_PARAMETERS_2, HUBPREQ, id),\
-       SRI(VBLANK_PARAMETERS_4, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_2, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_3, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_6, HUBPREQ, id),\
-       SRI(NOM_PARAMETERS_7, HUBPREQ, id),\
-       SRI(DCN_TTU_QOS_WM, HUBPREQ, id),\
-       SRI(DCN_GLOBAL_TTU_CNTL, HUBPREQ, id),\
-       SRI(DCN_SURF0_TTU_CNTL0, HUBPREQ, id),\
-       SRI(DCN_SURF0_TTU_CNTL1, HUBPREQ, id),\
-       SRI(DCN_SURF1_TTU_CNTL0, HUBPREQ, id),\
-       SRI(DCN_SURF1_TTU_CNTL1, HUBPREQ, id),\
-       SRI(DCN_VM_MX_L1_TLB_CNTL, HUBPREQ, id)
-
-#define MI_REG_LIST_DCN10(id)\
-       MI_REG_LIST_DCN(id),\
-       SRI(PREFETCH_SETTINS, HUBPREQ, id),\
-       SRI(PREFETCH_SETTINS_C, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, HUBPREQ, id),\
-       SRI(DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, HUBPREQ, id),\
-       SR(DCHUBBUB_SDPIF_FB_BASE),\
-       SR(DCHUBBUB_SDPIF_FB_OFFSET),\
-       SRI(CURSOR_SETTINS, HUBPREQ, id), \
-       SRI(CURSOR_SURFACE_ADDRESS_HIGH, CURSOR, id), \
-       SRI(CURSOR_SURFACE_ADDRESS, CURSOR, id), \
-       SRI(CURSOR_SIZE, CURSOR, id), \
-       SRI(CURSOR_CONTROL, CURSOR, id), \
-       SRI(CURSOR_POSITION, CURSOR, id), \
-       SRI(CURSOR_HOT_SPOT, CURSOR, id), \
-       SRI(CURSOR_DST_OFFSET, CURSOR, id)
-
-
-
-struct dcn_mi_registers {
-       uint32_t DCHUBP_CNTL;
-       uint32_t HUBPREQ_DEBUG_DB;
-       uint32_t DCSURF_ADDR_CONFIG;
-       uint32_t DCSURF_TILING_CONFIG;
-       uint32_t DCSURF_SURFACE_PITCH;
-       uint32_t DCSURF_SURFACE_PITCH_C;
-       uint32_t DCSURF_SURFACE_CONFIG;
-       uint32_t DCSURF_FLIP_CONTROL;
-       uint32_t DCSURF_PRI_VIEWPORT_DIMENSION;
-       uint32_t DCSURF_PRI_VIEWPORT_START;
-       uint32_t DCSURF_SEC_VIEWPORT_DIMENSION;
-       uint32_t DCSURF_SEC_VIEWPORT_START;
-       uint32_t DCSURF_PRI_VIEWPORT_DIMENSION_C;
-       uint32_t DCSURF_PRI_VIEWPORT_START_C;
-       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH;
-       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS;
-       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH;
-       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS;
-       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH;
-       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS;
-       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH;
-       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS;
-       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C;
-       uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_C;
-       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C;
-       uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_C;
-       uint32_t DCSURF_SURFACE_INUSE;
-       uint32_t DCSURF_SURFACE_INUSE_HIGH;
-       uint32_t DCSURF_SURFACE_INUSE_C;
-       uint32_t DCSURF_SURFACE_INUSE_HIGH_C;
-       uint32_t DCSURF_SURFACE_EARLIEST_INUSE;
-       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH;
-       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_C;
-       uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C;
-       uint32_t DCSURF_SURFACE_CONTROL;
-       uint32_t HUBPRET_CONTROL;
-       uint32_t DCN_EXPANSION_MODE;
-       uint32_t DCHUBP_REQ_SIZE_CONFIG;
-       uint32_t DCHUBP_REQ_SIZE_CONFIG_C;
-       uint32_t BLANK_OFFSET_0;
-       uint32_t BLANK_OFFSET_1;
-       uint32_t DST_DIMENSIONS;
-       uint32_t DST_AFTER_SCALER;
-       uint32_t PREFETCH_SETTINS;
-       uint32_t PREFETCH_SETTINGS;
-       uint32_t VBLANK_PARAMETERS_0;
-       uint32_t REF_FREQ_TO_PIX_FREQ;
-       uint32_t VBLANK_PARAMETERS_1;
-       uint32_t VBLANK_PARAMETERS_3;
-       uint32_t NOM_PARAMETERS_0;
-       uint32_t NOM_PARAMETERS_1;
-       uint32_t NOM_PARAMETERS_4;
-       uint32_t NOM_PARAMETERS_5;
-       uint32_t PER_LINE_DELIVERY_PRE;
-       uint32_t PER_LINE_DELIVERY;
-       uint32_t PREFETCH_SETTINS_C;
-       uint32_t PREFETCH_SETTINGS_C;
-       uint32_t VBLANK_PARAMETERS_2;
-       uint32_t VBLANK_PARAMETERS_4;
-       uint32_t NOM_PARAMETERS_2;
-       uint32_t NOM_PARAMETERS_3;
-       uint32_t NOM_PARAMETERS_6;
-       uint32_t NOM_PARAMETERS_7;
-       uint32_t DCN_TTU_QOS_WM;
-       uint32_t DCN_GLOBAL_TTU_CNTL;
-       uint32_t DCN_SURF0_TTU_CNTL0;
-       uint32_t DCN_SURF0_TTU_CNTL1;
-       uint32_t DCN_SURF1_TTU_CNTL0;
-       uint32_t DCN_SURF1_TTU_CNTL1;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB;
-       uint32_t DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB;
-       uint32_t DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB;
-       uint32_t DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB;
-       uint32_t DCN_VM_MX_L1_TLB_CNTL;
-       uint32_t DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB;
-       uint32_t DCN_VM_SYSTEM_APERTURE_LOW_ADDR;
-       uint32_t DCN_VM_SYSTEM_APERTURE_HIGH_ADDR;
-       uint32_t DCHUBBUB_SDPIF_FB_BASE;
-       uint32_t DCHUBBUB_SDPIF_FB_OFFSET;
-       uint32_t DCN_VM_FB_LOCATION_TOP;
-       uint32_t DCN_VM_FB_LOCATION_BASE;
-       uint32_t DCN_VM_FB_OFFSET;
-       uint32_t DCN_VM_AGP_BASE;
-       uint32_t DCN_VM_AGP_BOT;
-       uint32_t DCN_VM_AGP_TOP;
-       uint32_t CURSOR_SETTINS;
-       uint32_t CURSOR_SETTINGS;
-       uint32_t CURSOR_SURFACE_ADDRESS_HIGH;
-       uint32_t CURSOR_SURFACE_ADDRESS;
-       uint32_t CURSOR_SIZE;
-       uint32_t CURSOR_CONTROL;
-       uint32_t CURSOR_POSITION;
-       uint32_t CURSOR_HOT_SPOT;
-       uint32_t CURSOR_DST_OFFSET;
-};
-
-#define MI_SF(reg_name, field_name, post_fix)\
-       .field_name = reg_name ## __ ## field_name ## post_fix
-
-#define MI_MASK_SH_LIST_DCN(mask_sh)\
-       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_BLANK_EN, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_TTU_DISABLE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_UNDERFLOW_STATUS, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_CNTL, HUBP_NO_OUTSTANDING_REQ, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_PIPES, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_BANKS, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, PIPE_INTERLEAVE, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_SE, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, NUM_RB_PER_SE, mask_sh),\
-       MI_SF(HUBP0_DCSURF_ADDR_CONFIG, MAX_COMPRESSED_FRAGS, mask_sh),\
-       MI_SF(HUBP0_DCSURF_TILING_CONFIG, SW_MODE, mask_sh),\
-       MI_SF(HUBP0_DCSURF_TILING_CONFIG, META_LINEAR, mask_sh),\
-       MI_SF(HUBP0_DCSURF_TILING_CONFIG, RB_ALIGNED, mask_sh),\
-       MI_SF(HUBP0_DCSURF_TILING_CONFIG, PIPE_ALIGNED, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH, PITCH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH, META_PITCH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH_C, PITCH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_PITCH_C, META_PITCH_C, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, ROTATION_ANGLE, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, H_MIRROR_EN, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SURFACE_CONFIG, SURFACE_PIXEL_FORMAT, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_FLIP_TYPE, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_FLIP_PENDING, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_FLIP_CONTROL, SURFACE_UPDATE_LOCK, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION, PRI_VIEWPORT_WIDTH, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION, PRI_VIEWPORT_HEIGHT, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START, PRI_VIEWPORT_X_START, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START, PRI_VIEWPORT_Y_START, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION, SEC_VIEWPORT_WIDTH, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION, SEC_VIEWPORT_HEIGHT, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_START, SEC_VIEWPORT_X_START, mask_sh),\
-       MI_SF(HUBP0_DCSURF_SEC_VIEWPORT_START, SEC_VIEWPORT_Y_START, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C, PRI_VIEWPORT_WIDTH_C, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C, PRI_VIEWPORT_HEIGHT_C, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_X_START_C, mask_sh),\
-       MI_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_Y_START_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, PRIMARY_SURFACE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS, PRIMARY_SURFACE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, SECONDARY_SURFACE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS, SECONDARY_SURFACE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH, PRIMARY_META_SURFACE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS, PRIMARY_META_SURFACE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH, SECONDARY_META_SURFACE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS, SECONDARY_META_SURFACE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, PRIMARY_SURFACE_ADDRESS_HIGH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_C, PRIMARY_SURFACE_ADDRESS_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, PRIMARY_META_SURFACE_ADDRESS_HIGH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, PRIMARY_META_SURFACE_ADDRESS_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE, SURFACE_INUSE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH, SURFACE_INUSE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_C, SURFACE_INUSE_ADDRESS_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH_C, SURFACE_INUSE_ADDRESS_HIGH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE, SURFACE_EARLIEST_INUSE_ADDRESS, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_C, SURFACE_EARLIEST_INUSE_ADDRESS_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_TMZ, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_EN, mask_sh),\
-       MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_IND_64B_BLK, mask_sh),\
-       MI_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\
-       MI_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CB_B, mask_sh),\
-       MI_SF(HUBPRET0_HUBPRET_CONTROL, CROSSBAR_SRC_CR_R, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, DRQ_EXPANSION_MODE, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, PRQ_EXPANSION_MODE, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, MRQ_EXPANSION_MODE, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_EXPANSION_MODE, CRQ_EXPANSION_MODE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, CHUNK_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MIN_CHUNK_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, META_CHUNK_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MIN_META_CHUNK_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, DPTE_GROUP_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, MPTE_GROUP_SIZE, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, SWATH_HEIGHT, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG, PTE_ROW_HEIGHT_LINEAR, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, CHUNK_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MIN_CHUNK_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, META_CHUNK_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MIN_META_CHUNK_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, DPTE_GROUP_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, MPTE_GROUP_SIZE_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, SWATH_HEIGHT_C, mask_sh),\
-       MI_SF(HUBP0_DCHUBP_REQ_SIZE_CONFIG_C, PTE_ROW_HEIGHT_LINEAR_C, mask_sh),\
-       MI_SF(HUBPREQ0_BLANK_OFFSET_0, REFCYC_H_BLANK_END, mask_sh),\
-       MI_SF(HUBPREQ0_BLANK_OFFSET_0, DLG_V_BLANK_END, mask_sh),\
-       MI_SF(HUBPREQ0_BLANK_OFFSET_1, MIN_DST_Y_NEXT_START, mask_sh),\
-       MI_SF(HUBPREQ0_DST_DIMENSIONS, REFCYC_PER_HTOTAL, mask_sh),\
-       MI_SF(HUBPREQ0_DST_AFTER_SCALER, REFCYC_X_AFTER_SCALER, mask_sh),\
-       MI_SF(HUBPREQ0_DST_AFTER_SCALER, DST_Y_AFTER_SCALER, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_0, DST_Y_PER_VM_VBLANK, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_0, DST_Y_PER_ROW_VBLANK, mask_sh),\
-       MI_SF(HUBPREQ0_REF_FREQ_TO_PIX_FREQ, REF_FREQ_TO_PIX_FREQ, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_1, REFCYC_PER_PTE_GROUP_VBLANK_L, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_3, REFCYC_PER_META_CHUNK_VBLANK_L, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_0, DST_Y_PER_PTE_ROW_NOM_L, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_1, REFCYC_PER_PTE_GROUP_NOM_L, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_4, DST_Y_PER_META_ROW_NOM_L, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_5, REFCYC_PER_META_CHUNK_NOM_L, mask_sh),\
-       MI_SF(HUBPREQ0_PER_LINE_DELIVERY_PRE, REFCYC_PER_LINE_DELIVERY_PRE_L, mask_sh),\
-       MI_SF(HUBPREQ0_PER_LINE_DELIVERY_PRE, REFCYC_PER_LINE_DELIVERY_PRE_C, mask_sh),\
-       MI_SF(HUBPREQ0_PER_LINE_DELIVERY, REFCYC_PER_LINE_DELIVERY_L, mask_sh),\
-       MI_SF(HUBPREQ0_PER_LINE_DELIVERY, REFCYC_PER_LINE_DELIVERY_C, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_2, REFCYC_PER_PTE_GROUP_VBLANK_C, mask_sh),\
-       MI_SF(HUBPREQ0_VBLANK_PARAMETERS_4, REFCYC_PER_META_CHUNK_VBLANK_C, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_2, DST_Y_PER_PTE_ROW_NOM_C, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_3, REFCYC_PER_PTE_GROUP_NOM_C, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_6, DST_Y_PER_META_ROW_NOM_C, mask_sh),\
-       MI_SF(HUBPREQ0_NOM_PARAMETERS_7, REFCYC_PER_META_CHUNK_NOM_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_TTU_QOS_WM, QoS_LEVEL_LOW_WM, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_TTU_QOS_WM, QoS_LEVEL_HIGH_WM, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_GLOBAL_TTU_CNTL, MIN_TTU_VBLANK, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_GLOBAL_TTU_CNTL, QoS_LEVEL_FLIP, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, REFCYC_PER_REQ_DELIVERY, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, QoS_LEVEL_FIXED, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL0, QoS_RAMP_DISABLE, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_SURF0_TTU_CNTL1, REFCYC_PER_REQ_DELIVERY_PRE, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_MX_L1_TLB_CNTL, ENABLE_L1_TLB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_MX_L1_TLB_CNTL, SYSTEM_ACCESS_MODE, mask_sh)
-
-#define MI_MASK_SH_LIST_DCN10(mask_sh)\
-       MI_MASK_SH_LIST_DCN(mask_sh),\
-       MI_SF(HUBPREQ0_PREFETCH_SETTINS, DST_Y_PREFETCH, mask_sh),\
-       MI_SF(HUBPREQ0_PREFETCH_SETTINS, VRATIO_PREFETCH, mask_sh),\
-       MI_SF(HUBPREQ0_PREFETCH_SETTINS_C, VRATIO_PREFETCH_C, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB, mask_sh),\
-       MI_SF(DCHUBBUB_SDPIF_FB_BASE, SDPIF_FB_BASE, mask_sh),\
-       MI_SF(DCHUBBUB_SDPIF_FB_OFFSET, SDPIF_FB_OFFSET, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB, mask_sh),\
-       MI_SF(HUBPREQ0_DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, mask_sh),\
-       MI_SF(HUBPREQ0_CURSOR_SETTINS, CURSOR0_DST_Y_OFFSET, mask_sh), \
-       MI_SF(HUBPREQ0_CURSOR_SETTINS, CURSOR0_CHUNK_HDL_ADJUST, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_SURFACE_ADDRESS_HIGH, CURSOR_SURFACE_ADDRESS_HIGH, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_SURFACE_ADDRESS, CURSOR_SURFACE_ADDRESS, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_SIZE, CURSOR_WIDTH, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_SIZE, CURSOR_HEIGHT, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_MODE, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_2X_MAGNIFY, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_PITCH, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_LINES_PER_CHUNK, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_CONTROL, CURSOR_ENABLE, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_POSITION, CURSOR_X_POSITION, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_POSITION, CURSOR_Y_POSITION, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_X, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \
-       MI_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh)
-
-#define DCN_MI_REG_FIELD_LIST(type) \
-       type HUBP_BLANK_EN;\
-       type HUBP_TTU_DISABLE;\
-       type HUBP_NO_OUTSTANDING_REQ;\
-       type HUBP_UNDERFLOW_STATUS;\
-       type NUM_PIPES;\
-       type NUM_BANKS;\
-       type PIPE_INTERLEAVE;\
-       type NUM_SE;\
-       type NUM_RB_PER_SE;\
-       type MAX_COMPRESSED_FRAGS;\
-       type SW_MODE;\
-       type META_LINEAR;\
-       type RB_ALIGNED;\
-       type PIPE_ALIGNED;\
-       type PITCH;\
-       type META_PITCH;\
-       type PITCH_C;\
-       type META_PITCH_C;\
-       type ROTATION_ANGLE;\
-       type H_MIRROR_EN;\
-       type SURFACE_PIXEL_FORMAT;\
-       type SURFACE_FLIP_TYPE;\
-       type SURFACE_UPDATE_LOCK;\
-       type SURFACE_FLIP_PENDING;\
-       type PRI_VIEWPORT_WIDTH; \
-       type PRI_VIEWPORT_HEIGHT; \
-       type PRI_VIEWPORT_X_START; \
-       type PRI_VIEWPORT_Y_START; \
-       type SEC_VIEWPORT_WIDTH; \
-       type SEC_VIEWPORT_HEIGHT; \
-       type SEC_VIEWPORT_X_START; \
-       type SEC_VIEWPORT_Y_START; \
-       type PRI_VIEWPORT_WIDTH_C; \
-       type PRI_VIEWPORT_HEIGHT_C; \
-       type PRI_VIEWPORT_X_START_C; \
-       type PRI_VIEWPORT_Y_START_C; \
-       type PRIMARY_SURFACE_ADDRESS_HIGH;\
-       type PRIMARY_SURFACE_ADDRESS;\
-       type SECONDARY_SURFACE_ADDRESS_HIGH;\
-       type SECONDARY_SURFACE_ADDRESS;\
-       type PRIMARY_META_SURFACE_ADDRESS_HIGH;\
-       type PRIMARY_META_SURFACE_ADDRESS;\
-       type SECONDARY_META_SURFACE_ADDRESS_HIGH;\
-       type SECONDARY_META_SURFACE_ADDRESS;\
-       type PRIMARY_SURFACE_ADDRESS_HIGH_C;\
-       type PRIMARY_SURFACE_ADDRESS_C;\
-       type PRIMARY_META_SURFACE_ADDRESS_HIGH_C;\
-       type PRIMARY_META_SURFACE_ADDRESS_C;\
-       type SURFACE_INUSE_ADDRESS;\
-       type SURFACE_INUSE_ADDRESS_HIGH;\
-       type SURFACE_INUSE_ADDRESS_C;\
-       type SURFACE_INUSE_ADDRESS_HIGH_C;\
-       type SURFACE_EARLIEST_INUSE_ADDRESS;\
-       type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH;\
-       type SURFACE_EARLIEST_INUSE_ADDRESS_C;\
-       type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C;\
-       type PRIMARY_SURFACE_TMZ;\
-       type PRIMARY_SURFACE_DCC_EN;\
-       type PRIMARY_SURFACE_DCC_IND_64B_BLK;\
-       type DET_BUF_PLANE1_BASE_ADDRESS;\
-       type CROSSBAR_SRC_CB_B;\
-       type CROSSBAR_SRC_CR_R;\
-       type DRQ_EXPANSION_MODE;\
-       type PRQ_EXPANSION_MODE;\
-       type MRQ_EXPANSION_MODE;\
-       type CRQ_EXPANSION_MODE;\
-       type CHUNK_SIZE;\
-       type MIN_CHUNK_SIZE;\
-       type META_CHUNK_SIZE;\
-       type MIN_META_CHUNK_SIZE;\
-       type DPTE_GROUP_SIZE;\
-       type MPTE_GROUP_SIZE;\
-       type SWATH_HEIGHT;\
-       type PTE_ROW_HEIGHT_LINEAR;\
-       type CHUNK_SIZE_C;\
-       type MIN_CHUNK_SIZE_C;\
-       type META_CHUNK_SIZE_C;\
-       type MIN_META_CHUNK_SIZE_C;\
-       type DPTE_GROUP_SIZE_C;\
-       type MPTE_GROUP_SIZE_C;\
-       type SWATH_HEIGHT_C;\
-       type PTE_ROW_HEIGHT_LINEAR_C;\
-       type REFCYC_H_BLANK_END;\
-       type DLG_V_BLANK_END;\
-       type MIN_DST_Y_NEXT_START;\
-       type REFCYC_PER_HTOTAL;\
-       type REFCYC_X_AFTER_SCALER;\
-       type DST_Y_AFTER_SCALER;\
-       type DST_Y_PREFETCH;\
-       type VRATIO_PREFETCH;\
-       type DST_Y_PER_VM_VBLANK;\
-       type DST_Y_PER_ROW_VBLANK;\
-       type REF_FREQ_TO_PIX_FREQ;\
-       type REFCYC_PER_PTE_GROUP_VBLANK_L;\
-       type REFCYC_PER_META_CHUNK_VBLANK_L;\
-       type DST_Y_PER_PTE_ROW_NOM_L;\
-       type REFCYC_PER_PTE_GROUP_NOM_L;\
-       type DST_Y_PER_META_ROW_NOM_L;\
-       type REFCYC_PER_META_CHUNK_NOM_L;\
-       type REFCYC_PER_LINE_DELIVERY_PRE_L;\
-       type REFCYC_PER_LINE_DELIVERY_PRE_C;\
-       type REFCYC_PER_LINE_DELIVERY_L;\
-       type REFCYC_PER_LINE_DELIVERY_C;\
-       type VRATIO_PREFETCH_C;\
-       type REFCYC_PER_PTE_GROUP_VBLANK_C;\
-       type REFCYC_PER_META_CHUNK_VBLANK_C;\
-       type DST_Y_PER_PTE_ROW_NOM_C;\
-       type REFCYC_PER_PTE_GROUP_NOM_C;\
-       type DST_Y_PER_META_ROW_NOM_C;\
-       type REFCYC_PER_META_CHUNK_NOM_C;\
-       type QoS_LEVEL_LOW_WM;\
-       type QoS_LEVEL_HIGH_WM;\
-       type MIN_TTU_VBLANK;\
-       type QoS_LEVEL_FLIP;\
-       type REFCYC_PER_REQ_DELIVERY;\
-       type QoS_LEVEL_FIXED;\
-       type QoS_RAMP_DISABLE;\
-       type REFCYC_PER_REQ_DELIVERY_PRE;\
-       type VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_MSB;\
-       type VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LSB;\
-       type VM_CONTEXT0_PAGE_TABLE_START_ADDR_MSB;\
-       type VM_CONTEXT0_PAGE_TABLE_START_ADDR_LSB;\
-       type VM_CONTEXT0_PAGE_TABLE_END_ADDR_MSB;\
-       type VM_CONTEXT0_PAGE_TABLE_END_ADDR_LSB;\
-       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_MSB;\
-       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_SYSTEM;\
-       type VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR_LSB;\
-       type ENABLE_L1_TLB;\
-       type SYSTEM_ACCESS_MODE;\
-       type MC_VM_SYSTEM_APERTURE_DEFAULT_SYSTEM;\
-       type MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB;\
-       type MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB;\
-       type MC_VM_SYSTEM_APERTURE_LOW_ADDR_MSB;\
-       type MC_VM_SYSTEM_APERTURE_LOW_ADDR_LSB;\
-       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR_MSB;\
-       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR_LSB;\
-       type MC_VM_SYSTEM_APERTURE_LOW_ADDR;\
-       type MC_VM_SYSTEM_APERTURE_HIGH_ADDR;\
-       type SDPIF_FB_TOP;\
-       type SDPIF_FB_BASE;\
-       type SDPIF_FB_OFFSET;\
-       type SDPIF_AGP_BASE;\
-       type SDPIF_AGP_BOT;\
-       type SDPIF_AGP_TOP;\
-       type FB_TOP;\
-       type FB_BASE;\
-       type FB_OFFSET;\
-       type AGP_BASE;\
-       type AGP_BOT;\
-       type AGP_TOP;\
-       /* todo:  get these from GVM instead of reading registers ourselves */\
-       type PAGE_DIRECTORY_ENTRY_HI32;\
-       type PAGE_DIRECTORY_ENTRY_LO32;\
-       type LOGICAL_PAGE_NUMBER_HI4;\
-       type LOGICAL_PAGE_NUMBER_LO32;\
-       type PHYSICAL_PAGE_ADDR_HI4;\
-       type PHYSICAL_PAGE_ADDR_LO32;\
-       type PHYSICAL_PAGE_NUMBER_MSB;\
-       type PHYSICAL_PAGE_NUMBER_LSB;\
-       type LOGICAL_ADDR;\
-       type CURSOR0_DST_Y_OFFSET; \
-       type CURSOR0_CHUNK_HDL_ADJUST; \
-       type CURSOR_SURFACE_ADDRESS_HIGH; \
-       type CURSOR_SURFACE_ADDRESS; \
-       type CURSOR_WIDTH; \
-       type CURSOR_HEIGHT; \
-       type CURSOR_MODE; \
-       type CURSOR_2X_MAGNIFY; \
-       type CURSOR_PITCH; \
-       type CURSOR_LINES_PER_CHUNK; \
-       type CURSOR_ENABLE; \
-       type CURSOR_X_POSITION; \
-       type CURSOR_Y_POSITION; \
-       type CURSOR_HOT_SPOT_X; \
-       type CURSOR_HOT_SPOT_Y; \
-       type CURSOR_DST_X_OFFSET; \
-       type OUTPUT_FP
-
-struct dcn_mi_shift {
-       DCN_MI_REG_FIELD_LIST(uint8_t);
-};
-
-struct dcn_mi_mask {
-       DCN_MI_REG_FIELD_LIST(uint32_t);
-};
-
-struct dcn10_hubp {
-       struct hubp base;
-       const struct dcn_mi_registers *mi_regs;
-       const struct dcn_mi_shift *mi_shift;
-       const struct dcn_mi_mask *mi_mask;
-};
-
-void hubp1_program_surface_config(
-       struct hubp *hubp,
-       enum surface_pixel_format format,
-       union dc_tiling_info *tiling_info,
-       union plane_size *plane_size,
-       enum dc_rotation_angle rotation,
-       struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror);
-
-void hubp1_program_deadline(
-               struct hubp *hubp,
-               struct _vcs_dpi_display_dlg_regs_st *dlg_attr,
-               struct _vcs_dpi_display_ttu_regs_st *ttu_attr);
-
-void hubp1_program_requestor(
-               struct hubp *hubp,
-               struct _vcs_dpi_display_rq_regs_st *rq_regs);
-
-void hubp1_program_pixel_format(
-       struct dcn10_hubp *hubp,
-       enum surface_pixel_format format);
-
-void hubp1_program_size_and_rotation(
-       struct dcn10_hubp *hubp,
-       enum dc_rotation_angle rotation,
-       enum surface_pixel_format format,
-       const union plane_size *plane_size,
-       struct dc_plane_dcc_param *dcc,
-       bool horizontal_mirror);
-
-void hubp1_program_tiling(
-       struct dcn10_hubp *hubp,
-       const union dc_tiling_info *info,
-       const enum surface_pixel_format pixel_format);
-
-void hubp1_dcc_control(struct hubp *hubp,
-               bool enable,
-               bool independent_64b_blks);
-
-bool hubp1_program_surface_flip_and_addr(
-       struct hubp *hubp,
-       const struct dc_plane_address *address,
-       bool flip_immediate);
-
-bool hubp1_is_flip_pending(struct hubp *hubp);
-
-void hubp1_cursor_set_attributes(
-               struct hubp *hubp,
-               const struct dc_cursor_attributes *attr);
-
-void hubp1_cursor_set_position(
-               struct hubp *hubp,
-               const struct dc_cursor_position *pos,
-               const struct dc_cursor_mi_param *param);
-
-void hubp1_set_blank(struct hubp *hubp, bool blank);
-
-void min_set_viewport(struct hubp *hubp,
-               const struct rect *viewport,
-               const struct rect *viewport_c);
-
-void dcn10_hubp_construct(
-       struct dcn10_hubp *hubp1,
-       struct dc_context *ctx,
-       uint32_t inst,
-       const struct dcn_mi_registers *mi_regs,
-       const struct dcn_mi_shift *mi_shift,
-       const struct dcn_mi_mask *mi_mask);
-
-
-struct dcn_hubp_state {
-       uint32_t pixel_format;
-       uint32_t inuse_addr_hi;
-       uint32_t viewport_width;
-       uint32_t viewport_height;
-       uint32_t rotation_angle;
-       uint32_t h_mirror_en;
-       uint32_t sw_mode;
-       uint32_t dcc_en;
-       uint32_t blank_en;
-       uint32_t underflow_status;
-       uint32_t ttu_disable;
-       uint32_t min_ttu_vblank;
-       uint32_t qos_level_low_wm;
-       uint32_t qos_level_high_wm;
-};
-void hubp1_read_state(struct dcn10_hubp *hubp1,
-               struct dcn_hubp_state *s);
-
-#endif
index 93edbba762e8832c1f9c81a1308fe187595c2e56..1da5105ed30a96d448e5ab6c84aec6e4df4edcfc 100644 (file)
 #include "dce/dce_stream_encoder.h"
 #include "dce/dce_clocks.h"
 #include "dce/dce_clock_source.h"
-#include "dcn10/dcn10_mem_input.h"
 #include "dce/dce_audio.h"
 #include "dce/dce_hwseq.h"
 #include "../virtual/virtual_stream_encoder.h"
 #include "dce110/dce110_resource.h"
 #include "dce112/dce112_resource.h"
+#include "dcn10_hubp.h"
 
 #include "vega10/soc15ip.h"