drm/amdgpu: drop set_vga_render_state from display funcs (v3)
Subsystems (3)
PATCH 1/3 drm/amdgpu: drop set_vga_render_state from display funcs (v3)
Not used.
v2: include DC as well
v3: handle vega10/RV
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 57 ----------------------- 11 files changed, 6 insertions(+), 86 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -1902,7 +1902,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_ih_get_wptr (adev) (adev)->irq.ih_funcs->get_wptr((adev))#define amdgpu_ih_decode_iv (adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))#define amdgpu_ih_set_rptr (adev) (adev)->irq.ih_funcs->set_rptr((adev)) -#define amdgpu_display_set_vga_render_state (adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))#define amdgpu_display_vblank_get_counter (adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))#define amdgpu_display_vblank_wait (adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))#define amdgpu_display_backlight_set_level (adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -2
@@ -270,8 +270,6 @@ struct amdgpu_mode_mc_save { };struct amdgpu_display_funcs { -/* vga render */ -void (*set_vga_render_state)(struct amdgpu_device *adev,bool render);/* display watermarks */ void (*bandwidth_update)(struct amdgpu_device *adev);/* get frame count */
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2 -3
@@ -612,8 +612,8 @@ void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;
@@ -3736,7 +3736,6 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v10_0_display_funcs = { - .set_vga_render_state = &dce_v10_0_set_vga_render_state, .bandwidth_update = &dce_v10_0_bandwidth_update, .vblank_get_counter = &dce_v10_0_vblank_get_counter, .vblank_wait = &dce_v10_0_vblank_wait,
drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +0 -3
@@ -29,9 +29,6 @@ extern const struct amdgpu_ip_block_version dce_v10_0_ip_block;extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev); - -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v10_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2 -3
@@ -572,8 +572,8 @@ void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;
@@ -3805,7 +3805,6 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v11_0_display_funcs = { - .set_vga_render_state = &dce_v11_0_set_vga_render_state, .bandwidth_update = &dce_v11_0_bandwidth_update, .vblank_get_counter = &dce_v11_0_vblank_get_counter, .vblank_wait = &dce_v11_0_vblank_wait,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +0 -3
@@ -28,9 +28,6 @@ extern const struct amdgpu_ip_block_version dce_v11_0_ip_block;extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev); - -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v11_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -1
@@ -3524,7 +3524,6 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v6_0_display_funcs = { - .set_vga_render_state = &dce_v6_0_set_vga_render_state, .bandwidth_update = &dce_v6_0_bandwidth_update, .vblank_get_counter = &dce_v6_0_vblank_get_counter, .vblank_wait = &dce_v6_0_vblank_wait,
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2 -3
@@ -494,8 +494,8 @@ void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;
@@ -3573,7 +3573,6 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v8_0_display_funcs = { - .set_vga_render_state = &dce_v8_0_set_vga_render_state, .bandwidth_update = &dce_v8_0_bandwidth_update, .vblank_get_counter = &dce_v8_0_vblank_get_counter, .vblank_wait = &dce_v8_0_vblank_wait,
drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +0 -3
@@ -31,9 +31,6 @@ extern const struct amdgpu_ip_block_version dce_v8_3_ip_block;extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev); - -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v8_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0 -7
@@ -145,12 +145,6 @@ static void dce_virtual_resume_mc_access(struct amdgpu_device *adev,return ; } -static void dce_virtual_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -return ; -} -/** * dce_virtual_bandwidth_update - program display watermarks *
@@ -676,7 +670,6 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_virtual_display_funcs = { - .set_vga_render_state = &dce_virtual_set_vga_render_state, .bandwidth_update = &dce_virtual_bandwidth_update, .vblank_get_counter = &dce_virtual_vblank_get_counter, .vblank_wait = &dce_virtual_vblank_wait,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -57
89 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1497564159-12487-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu: remove *_mc_access from display funcs (v3)
These are no longer needed now that we use the fb_location programmed by the vbios.
v2: update DC as well
v3: handle vega10/RV
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 10 -- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 130 ---------------------- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 75 ------------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 113 ------------------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 77 ------------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 5 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 91 +++++++-------- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 18 +-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 17 +-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 16 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 82 -------------- 15 files changed, 54 insertions(+), 599 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -3
@@ -615,7 +615,6 @@ struct amdgpu_mc {struct amdgpu_irq_src vm_fault;uint32_t vram_type;uint32_t srbm_soft_reset; -struct amdgpu_mode_mc_save save;bool prt_warning;uint64_t stolen_size;/* apertures */
@@ -1914,8 +1913,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_display_page_flip_get_scanoutpos (adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos))#define amdgpu_display_add_encoder (adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c))#define amdgpu_display_add_connector (adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r)) -#define amdgpu_display_stop_mc_access (adev, s) (adev)->mode_info.funcs->stop_mc_access((adev), (s)) -#define amdgpu_display_resume_mc_access (adev, s) (adev)->mode_info.funcs->resume_mc_access((adev), (s))#define amdgpu_emit_copy_buffer (adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_copy_buffer((ib), (s), (d), (b))#define amdgpu_emit_fill_buffer (adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b))#define amdgpu_gfx_get_gpu_clock_counter (adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -6
@@ -2925,12 +2925,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) r =amdgpu_suspend (adev); retry: -/* Disable fb access */ -if (adev->mode_info.num_crtc) { -struct amdgpu_mode_mc_save save; -amdgpu_display_stop_mc_access (adev, &save); -amdgpu_wait_for_idle (adev,AMD_IP_BLOCK_TYPE_GMC ); - }if (adev->is_atom_fw)amdgpu_atomfirmware_scratch_regs_save (adev);else
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -10
@@ -263,12 +263,6 @@ struct amdgpu_audio {int num_pins; }; -struct amdgpu_mode_mc_save { -u32 vga_render_control; -u32 vga_hdp_control; -bool crtc_enabled[AMDGPU_MAX_CRTCS ]; -}; -struct amdgpu_display_funcs {/* display watermarks */ void (*bandwidth_update)(struct amdgpu_device *adev);
@@ -304,10 +298,6 @@ struct amdgpu_display_funcs {uint16_t connector_object_id, struct amdgpu_hpd *hpd, struct amdgpu_router *router); -void (*stop_mc_access)(struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); -void (*resume_mc_access)(struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save);/* it is used to enter or exit into free sync mode */ int (*notify_freesync)(struct drm_device *dev,void *data,struct drm_file *filp);
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0 -130
142 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +1 -4
@@ -29,8 +29,5 @@ extern const struct amdgpu_ip_block_version dce_v10_0_ip_block;extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev); -void dce_v10_0_stop_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); -void dce_v10_0_resume_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); +#endif
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0 -75
87 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +1 -4
@@ -28,8 +28,5 @@ extern const struct amdgpu_ip_block_version dce_v11_0_ip_block;extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev); -void dce_v11_0_stop_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); -void dce_v11_0_resume_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); +#endif
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -113
125 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +0 -77
89 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +1 -4
@@ -31,8 +31,5 @@ extern const struct amdgpu_ip_block_version dce_v8_3_ip_block;extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev); -void dce_v8_0_stop_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); -void dce_v8_0_resume_mc_access (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save); +#endif
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +39 -52
109 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +4 -14
@@ -66,14 +66,10 @@ static const u32 crtc_offsets[6] = SI_CRTC5_REGISTER_OFFSET }; -static void gmc_v6_0_mc_stop (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v6_0_mc_stop (struct amdgpu_device *adev) {u32 blackout; -if (adev->mode_info.num_crtc) -amdgpu_display_stop_mc_access (adev, save); -gmc_v6_0_wait_for_idle ((void *)adev); blackout =RREG32 (mmMC_SHARED_BLACKOUT_CNTL);
@@ -90,8 +86,7 @@ static void gmc_v6_0_mc_stop(struct amdgpu_device *adev, } -static void gmc_v6_0_mc_resume (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v6_0_mc_resume (struct amdgpu_device *adev) {u32 tmp;
@@ -103,10 +98,6 @@ static void gmc_v6_0_mc_resume(struct amdgpu_device *adev, tmp =REG_SET_FIELD (0 ,BIF_FB_EN ,FB_READ_EN ,1 ); tmp =REG_SET_FIELD (tmp,BIF_FB_EN ,FB_WRITE_EN ,1 );WREG32 (mmBIF_FB_EN, tmp); - -if (adev->mode_info.num_crtc) -amdgpu_display_resume_mc_access (adev, save); - }static int gmc_v6_0_init_microcode (struct amdgpu_device *adev)
@@ -975,7 +966,6 @@ static int gmc_v6_0_wait_for_idle(void *handle)static int gmc_v6_0_soft_reset (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_mode_mc_save save;u32 srbm_soft_reset =0 ;u32 tmp =RREG32 (mmSRBM_STATUS);
@@ -991,7 +981,7 @@ static int gmc_v6_0_soft_reset(void *handle) }if (srbm_soft_reset) { -gmc_v6_0_mc_stop (adev, &save); +gmc_v6_0_mc_stop (adev);if (gmc_v6_0_wait_for_idle (adev)) {dev_warn (adev->dev,"Wait for GMC idle timed out !\n" ); }
@@ -1011,7 +1001,7 @@ static int gmc_v6_0_soft_reset(void *handle)udelay (50 ); -gmc_v6_0_mc_resume (adev, &save); +gmc_v6_0_mc_resume (adev);udelay (50 ); }
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +4 -13
@@ -76,14 +76,10 @@ static void gmc_v7_0_init_golden_registers(struct amdgpu_device *adev) } } -static void gmc_v7_0_mc_stop (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v7_0_mc_stop (struct amdgpu_device *adev) {u32 blackout; -if (adev->mode_info.num_crtc) -amdgpu_display_stop_mc_access (adev, save); -gmc_v7_0_wait_for_idle ((void *)adev); blackout =RREG32 (mmMC_SHARED_BLACKOUT_CNTL);
@@ -99,8 +95,7 @@ static void gmc_v7_0_mc_stop(struct amdgpu_device *adev,udelay (100 ); } -static void gmc_v7_0_mc_resume (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v7_0_mc_resume (struct amdgpu_device *adev) {u32 tmp;
@@ -112,9 +107,6 @@ static void gmc_v7_0_mc_resume(struct amdgpu_device *adev, tmp =REG_SET_FIELD (0 ,BIF_FB_EN ,FB_READ_EN ,1 ); tmp =REG_SET_FIELD (tmp,BIF_FB_EN ,FB_WRITE_EN ,1 );WREG32 (mmBIF_FB_EN, tmp); - -if (adev->mode_info.num_crtc) -amdgpu_display_resume_mc_access (adev, save); }/**
@@ -1128,7 +1120,6 @@ static int gmc_v7_0_wait_for_idle(void *handle)static int gmc_v7_0_soft_reset (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -struct amdgpu_mode_mc_save save;u32 srbm_soft_reset =0 ;u32 tmp =RREG32 (mmSRBM_STATUS);
@@ -1144,7 +1135,7 @@ static int gmc_v7_0_soft_reset(void *handle) }if (srbm_soft_reset) { -gmc_v7_0_mc_stop (adev, &save); +gmc_v7_0_mc_stop (adev);if (gmc_v7_0_wait_for_idle ((void *)adev)) {dev_warn (adev->dev,"Wait for GMC idle timed out !\n" ); }
@@ -1165,7 +1156,7 @@ static int gmc_v7_0_soft_reset(void *handle)/* Wait a little for things to settle down */ udelay (50 ); -gmc_v7_0_mc_resume (adev, &save); +gmc_v7_0_mc_resume (adev);udelay (50 ); }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -12
@@ -161,14 +161,10 @@ static void gmc_v8_0_init_golden_registers(struct amdgpu_device *adev) } } -static void gmc_v8_0_mc_stop (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v8_0_mc_stop (struct amdgpu_device *adev) {u32 blackout; -if (adev->mode_info.num_crtc) -amdgpu_display_stop_mc_access (adev, save); -gmc_v8_0_wait_for_idle (adev); blackout =RREG32 (mmMC_SHARED_BLACKOUT_CNTL);
@@ -184,8 +180,7 @@ static void gmc_v8_0_mc_stop(struct amdgpu_device *adev,udelay (100 ); } -static void gmc_v8_0_mc_resume (struct amdgpu_device *adev, -struct amdgpu_mode_mc_save *save) +static void gmc_v8_0_mc_resume (struct amdgpu_device *adev) {u32 tmp;
@@ -197,9 +192,6 @@ static void gmc_v8_0_mc_resume(struct amdgpu_device *adev, tmp =REG_SET_FIELD (0 ,BIF_FB_EN ,FB_READ_EN ,1 ); tmp =REG_SET_FIELD (tmp,BIF_FB_EN ,FB_WRITE_EN ,1 );WREG32 (mmBIF_FB_EN, tmp); - -if (adev->mode_info.num_crtc) -amdgpu_display_resume_mc_access (adev, save); }/**
@@ -1250,7 +1242,7 @@ static int gmc_v8_0_pre_soft_reset(void *handle)if (!adev->mc.srbm_soft_reset)return 0 ; -gmc_v8_0_mc_stop (adev, &adev->mc.save); +gmc_v8_0_mc_stop (adev);if (gmc_v8_0_wait_for_idle (adev)) {dev_warn (adev->dev,"Wait for GMC idle timed out !\n" ); }
@@ -1296,7 +1288,7 @@ static int gmc_v8_0_post_soft_reset(void *handle)if (!adev->mc.srbm_soft_reset)return 0 ; -gmc_v8_0_mc_resume (adev, &adev->mc.save); +gmc_v8_0_mc_resume (adev);return 0 ; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -82
124 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/dc/dm: remove redundant display structs (v2)
In reply to a message not in the archiveNow that the mc_access functions are gone, we no longer need separate structs for all the different dce families in dm.
v2: rebase on vega10/RV
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 105 +--------------------- 1 file changed, 4 insertions(+), 101 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -101
@@ -1454,28 +1454,7 @@ static int amdgpu_notify_freesync(struct drm_device *dev, void *data,return r; } -#ifdef CONFIG_DRM_AMDGPU_CIK -static const struct amdgpu_display_funcs dm_dce_v8_0_display_funcs = { - .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ - .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ - .vblank_wait =NULL , - .backlight_set_level = - dm_set_backlight_level,/* called unconditionally */ - .backlight_get_level = - dm_get_backlight_level,/* called unconditionally */ - .hpd_sense =NULL ,/* called unconditionally */ - .hpd_set_polarity =NULL ,/* called unconditionally */ - .hpd_get_gpio_reg =NULL ,/* VBIOS parsing. DAL does it. */ - .page_flip = dm_page_flip,/* called unconditionally */ - .page_flip_get_scanoutpos = - dm_crtc_get_scanoutpos,/* called unconditionally */ - .add_encoder =NULL ,/* VBIOS parsing. DAL does it. */ - .add_connector =NULL ,/* VBIOS parsing. DAL does it. */ - .notify_freesync = amdgpu_notify_freesync, -}; -#endif - -static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { +static const struct amdgpu_display_funcs dm_display_funcs = { .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,
@@ -1495,67 +1474,6 @@ static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { }; -static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = { - .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ - .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ - .vblank_wait =NULL , - .backlight_set_level = - dm_set_backlight_level,/* called unconditionally */ - .backlight_get_level = - dm_get_backlight_level,/* called unconditionally */ - .hpd_sense =NULL ,/* called unconditionally */ - .hpd_set_polarity =NULL ,/* called unconditionally */ - .hpd_get_gpio_reg =NULL ,/* VBIOS parsing. DAL does it. */ - .page_flip = dm_page_flip,/* called unconditionally */ - .page_flip_get_scanoutpos = - dm_crtc_get_scanoutpos,/* called unconditionally */ - .add_encoder =NULL ,/* VBIOS parsing. DAL does it. */ - .add_connector =NULL ,/* VBIOS parsing. DAL does it. */ - .notify_freesync = amdgpu_notify_freesync, - -}; - -static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = { - .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ - .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ - .vblank_wait =NULL , - .backlight_set_level = - dm_set_backlight_level,/* called unconditionally */ - .backlight_get_level = - dm_get_backlight_level,/* called unconditionally */ - .hpd_sense =NULL ,/* called unconditionally */ - .hpd_set_polarity =NULL ,/* called unconditionally */ - .hpd_get_gpio_reg =NULL ,/* VBIOS parsing. DAL does it. */ - .page_flip = dm_page_flip,/* called unconditionally */ - .page_flip_get_scanoutpos = - dm_crtc_get_scanoutpos,/* called unconditionally */ - .add_encoder =NULL ,/* VBIOS parsing. DAL does it. */ - .add_connector =NULL ,/* VBIOS parsing. DAL does it. */ - .notify_freesync = amdgpu_notify_freesync, - -}; - -#if defined(CONFIG_DRM_AMD_DC_DCN1_0 ) -static const struct amdgpu_display_funcs dm_dcn_v1_0_display_funcs = { - .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ - .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ - .vblank_wait =NULL , - .backlight_set_level = - dm_set_backlight_level,/* called unconditionally */ - .backlight_get_level = - dm_get_backlight_level,/* called unconditionally */ - .hpd_sense =NULL ,/* called unconditionally */ - .hpd_set_polarity =NULL ,/* called unconditionally */ - .hpd_get_gpio_reg =NULL ,/* VBIOS parsing. DAL does it. */ - .page_flip = dm_page_flip,/* called unconditionally */ - .page_flip_get_scanoutpos = - dm_crtc_get_scanoutpos,/* called unconditionally */ - .add_encoder =NULL ,/* VBIOS parsing. DAL does it. */ - .add_connector =NULL ,/* VBIOS parsing. DAL does it. */ - .notify_freesync = amdgpu_notify_freesync, - -}; -#endif #if defined(CONFIG_DEBUG_KERNEL_DC )
@@ -1602,10 +1520,6 @@ static int dm_early_init(void *handle) adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =6 ; adev->mode_info.plane_type = dm_surfaces_type_default; -#ifdef CONFIG_DRM_AMDGPU_CIK -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v8_0_display_funcs; -#endif break ;case CHIP_FIJI :case CHIP_TONGA :
@@ -1613,24 +1527,18 @@ static int dm_early_init(void *handle) adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =7 ; adev->mode_info.plane_type = dm_surfaces_type_default; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v10_0_display_funcs;break ;case CHIP_CARRIZO : adev->mode_info.num_crtc =3 ; adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =9 ; adev->mode_info.plane_type = dm_surfaces_type_carizzo; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v11_0_display_funcs;break ;case CHIP_STONEY : adev->mode_info.num_crtc =2 ; adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =9 ; adev->mode_info.plane_type = dm_surfaces_type_stoney; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v11_0_display_funcs;break ;case CHIP_POLARIS11 :case CHIP_POLARIS12 :
@@ -1638,24 +1546,18 @@ static int dm_early_init(void *handle) adev->mode_info.num_hpd =5 ; adev->mode_info.num_dig =5 ; adev->mode_info.plane_type = dm_surfaces_type_default; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v11_0_display_funcs;break ;case CHIP_POLARIS10 : adev->mode_info.num_crtc =6 ; adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =6 ; adev->mode_info.plane_type = dm_surfaces_type_default; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v11_0_display_funcs;break ;case CHIP_VEGA10 : adev->mode_info.num_crtc =6 ; adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =6 ; adev->mode_info.plane_type = dm_surfaces_type_default; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dce_v12_0_display_funcs;break ;#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN :
@@ -1663,8 +1565,6 @@ static int dm_early_init(void *handle) adev->mode_info.num_hpd =4 ; adev->mode_info.num_dig =4 ; adev->mode_info.plane_type = dm_surfaces_type_default; -if (adev->mode_info.funcs ==NULL ) - adev->mode_info.funcs = &dm_dcn_v1_0_display_funcs;break ;#endif default :
@@ -1672,6 +1572,9 @@ static int dm_early_init(void *handle)return -EINVAL ; } +if (adev->mode_info.funcs ==NULL ) + adev->mode_info.funcs = &dm_display_funcs; +/* Note: Do NOT change adev->audio_endpt_rreg and * adev->audio_endpt_wreg because they are initialised in * amdgpu_device_init() */
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 7 lines · Alex Deucher
Not used.
v2: include DC as well
v3: handle vega10/RVReviewed-by Christian König <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Ping?
Quoted 286 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 57 ----------------------- 11 files changed, 6 insertions(+), 86 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -1902,7 +1902,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_ih_get_wptr (adev) (adev)->irq.ih_funcs->get_wptr((adev))#define amdgpu_ih_decode_iv (adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))#define amdgpu_ih_set_rptr (adev) (adev)->irq.ih_funcs->set_rptr((adev)) -#define amdgpu_display_set_vga_render_state (adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))#define amdgpu_display_vblank_get_counter (adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))#define amdgpu_display_vblank_wait (adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))#define amdgpu_display_backlight_set_level (adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0
-2@@ -270,8 +270,6 @@ struct amdgpu_mode_mc_save { };struct amdgpu_display_funcs { -/* vga render */ -void (*set_vga_render_state)(struct amdgpu_device *adev,bool render);/* display watermarks */ void (*bandwidth_update)(struct amdgpu_device *adev);/* get frame count */ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2
-3@@ -612,8 +612,8 @@ void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3736,7 +3736,6 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v10_0_display_funcs = { - .set_vga_render_state = &dce_v10_0_set_vga_render_state, .bandwidth_update = &dce_v10_0_bandwidth_update, .vblank_get_counter = &dce_v10_0_vblank_get_counter, .vblank_wait = &dce_v10_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +0
-3@@ -29,9 +29,6 @@ extern const struct amdgpu_ip_block_version dce_v10_0_ip_block;extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev); - -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v10_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2
-3@@ -572,8 +572,8 @@ void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3805,7 +3805,6 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v11_0_display_funcs = { - .set_vga_render_state = &dce_v11_0_set_vga_render_state, .bandwidth_update = &dce_v11_0_bandwidth_update, .vblank_get_counter = &dce_v11_0_vblank_get_counter, .vblank_wait = &dce_v11_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +0
-3@@ -28,9 +28,6 @@ extern const struct amdgpu_ip_block_version dce_v11_0_ip_block;extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev); - -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v11_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0
-1@@ -3524,7 +3524,6 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v6_0_display_funcs = { - .set_vga_render_state = &dce_v6_0_set_vga_render_state, .bandwidth_update = &dce_v6_0_bandwidth_update, .vblank_get_counter = &dce_v6_0_vblank_get_counter, .vblank_wait = &dce_v6_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2
-3@@ -494,8 +494,8 @@ void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3573,7 +3573,6 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v8_0_display_funcs = { - .set_vga_render_state = &dce_v8_0_set_vga_render_state, .bandwidth_update = &dce_v8_0_bandwidth_update, .vblank_get_counter = &dce_v8_0_vblank_get_counter, .vblank_wait = &dce_v8_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +0
-3@@ -31,9 +31,6 @@ extern const struct amdgpu_ip_block_version dce_v8_3_ip_block;extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev); - -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v8_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-7@@ -145,12 +145,6 @@ static void dce_virtual_resume_mc_access(struct amdgpu_device *adev,return ; } -static void dce_virtual_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -return ; -} -/** * dce_virtual_bandwidth_update - program display watermarks * @@ -676,7 +670,6 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_virtual_display_funcs = { - .set_vga_render_state = &dce_virtual_set_vga_render_state, .bandwidth_update = &dce_virtual_bandwidth_update, .vblank_get_counter = &dce_virtual_vblank_get_counter, .vblank_wait = &dce_virtual_vblank_wait,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-58@@ -1526,61 +1526,8 @@ void dce_v12_0_resume_mc_access(struct amdgpu_device *adev,#endif } -void dce_v12_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -u32 tmp; - -/* Lockout access through VGA aperture*/ - tmp =RREG32 (0xCA ); -if (render) { - tmp = tmp &0xFFFFFFEF ; -WREG32 (0xCA , tmp); - }else { - tmp |=0x10 ; -WREG32 (0xCA , tmp); - } - -/* disable VGA render */ - tmp =RREG32 (0xC0 ); -if (render) { - tmp |=0x10000 ; -WREG32 (0xC0 , tmp); - }else { - tmp = tmp &0xFFFCFFFF ; -WREG32 (0xC0 , tmp); - } -} - -#if defined(CONFIG_DRM_AMD_DC_DCN1_0 ) -void dcn_v1_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -u32 tmp; - -/* Lockout access through VGA aperture*/ - tmp =RREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL)); -if (render) - tmp = tmp &0xFFFFFFEF ; -else - tmp |=0x10 ; - -WREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL), tmp); - -/* disable VGA render */ - tmp =RREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_RENDER_CONTROL)); -if (render) - tmp |=0x10000 ; -else - tmp = tmp &0xFFFCFFFF ; - -WREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL), tmp); -} -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK static const struct amdgpu_display_funcs dm_dce_v8_0_display_funcs = { - .set_vga_render_state = dce_v8_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait = NULL,@@ -1603,7 +1550,6 @@ static const struct amdgpu_display_funcs dm_dce_v8_0_display_funcs = {#endif static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { - .set_vga_render_state = dce_v10_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,@@ -1626,7 +1572,6 @@ static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { };static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = { - .set_vga_render_state = dce_v11_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,@@ -1649,7 +1594,6 @@ static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = { };static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = { - .set_vga_render_state = dce_v12_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,@@ -1673,7 +1617,6 @@ static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = {#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )static const struct amdgpu_display_funcs dm_dcn_v1_0_display_funcs = { - .set_vga_render_state = dcn_v1_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait = NULL, --
Quoted 2 lines
2.5.5
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 16.06.2017 um 00:02 schrieb Alex Deucher:
Quoted 7 lines
Not used.
v2: include DC as well
v3: handle vega10/RVReviewed-by Christian König <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Nice cleanup.
Regards,
Christian.
Quoted 278 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 3 -- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 57 ----------------------- 11 files changed, 6 insertions(+), 86 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -1902,7 +1902,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_ih_get_wptr (adev) (adev)->irq.ih_funcs->get_wptr((adev))#define amdgpu_ih_decode_iv (adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))#define amdgpu_ih_set_rptr (adev) (adev)->irq.ih_funcs->set_rptr((adev)) -#define amdgpu_display_set_vga_render_state (adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))#define amdgpu_display_vblank_get_counter (adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))#define amdgpu_display_vblank_wait (adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))#define amdgpu_display_backlight_set_level (adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0
-2@@ -270,8 +270,6 @@ struct amdgpu_mode_mc_save { };struct amdgpu_display_funcs { -/* vga render */ -void (*set_vga_render_state)(struct amdgpu_device *adev,bool render);/* display watermarks */ void (*bandwidth_update)(struct amdgpu_device *adev);/* get frame count */ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2
-3@@ -612,8 +612,8 @@ void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3736,7 +3736,6 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v10_0_display_funcs = { - .set_vga_render_state = &dce_v10_0_set_vga_render_state, .bandwidth_update = &dce_v10_0_bandwidth_update, .vblank_get_counter = &dce_v10_0_vblank_get_counter, .vblank_wait = &dce_v10_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +0
-3@@ -29,9 +29,6 @@ extern const struct amdgpu_ip_block_version dce_v10_0_ip_block;extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev); - -void dce_v10_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v10_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v10_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2
-3@@ -572,8 +572,8 @@ void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3805,7 +3805,6 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v11_0_display_funcs = { - .set_vga_render_state = &dce_v11_0_set_vga_render_state, .bandwidth_update = &dce_v11_0_bandwidth_update, .vblank_get_counter = &dce_v11_0_vblank_get_counter, .vblank_wait = &dce_v11_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +0
-3@@ -28,9 +28,6 @@ extern const struct amdgpu_ip_block_version dce_v11_0_ip_block;extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev); - -void dce_v11_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v11_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v11_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0
-1@@ -3524,7 +3524,6 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v6_0_display_funcs = { - .set_vga_render_state = &dce_v6_0_set_vga_render_state, .bandwidth_update = &dce_v6_0_bandwidth_update, .vblank_get_counter = &dce_v6_0_vblank_get_counter, .vblank_wait = &dce_v6_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2
-3@@ -494,8 +494,8 @@ void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,WREG32 (mmVGA_RENDER_CONTROL, save->vga_render_control); } -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) +static void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, +bool render) {u32 tmp;@@ -3573,7 +3573,6 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_v8_0_display_funcs = { - .set_vga_render_state = &dce_v8_0_set_vga_render_state, .bandwidth_update = &dce_v8_0_bandwidth_update, .vblank_get_counter = &dce_v8_0_vblank_get_counter, .vblank_wait = &dce_v8_0_vblank_wait,drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +0
-3@@ -31,9 +31,6 @@ extern const struct amdgpu_ip_block_version dce_v8_3_ip_block;extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev); - -void dce_v8_0_set_vga_render_state (struct amdgpu_device *adev, -bool render);void dce_v8_0_stop_mc_access (struct amdgpu_device *adev,struct amdgpu_mode_mc_save *save); void dce_v8_0_resume_mc_access(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0
-7@@ -145,12 +145,6 @@ static void dce_virtual_resume_mc_access(struct amdgpu_device *adev,return ; } -static void dce_virtual_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -return ; -} -/** * dce_virtual_bandwidth_update - program display watermarks * @@ -676,7 +670,6 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev, }static const struct amdgpu_display_funcs dce_virtual_display_funcs = { - .set_vga_render_state = &dce_virtual_set_vga_render_state, .bandwidth_update = &dce_virtual_bandwidth_update, .vblank_get_counter = &dce_virtual_vblank_get_counter, .vblank_wait = &dce_virtual_vblank_wait,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-56@@ -1526,61 +1526,8 @@ void dce_v12_0_resume_mc_access(struct amdgpu_device *adev,#endif } -void dce_v12_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -u32 tmp; - -/* Lockout access through VGA aperture*/ - tmp =RREG32 (0xCA ); -if (render) { - tmp = tmp &0xFFFFFFEF ; -WREG32 (0xCA , tmp); - }else { - tmp |=0x10 ; -WREG32 (0xCA , tmp); - } - -/* disable VGA render */ - tmp =RREG32 (0xC0 ); -if (render) { - tmp |=0x10000 ; -WREG32 (0xC0 , tmp); - }else { - tmp = tmp &0xFFFCFFFF ; -WREG32 (0xC0 , tmp); - } -} - -#if defined(CONFIG_DRM_AMD_DC_DCN1_0 ) -void dcn_v1_0_set_vga_render_state (struct amdgpu_device *adev, -bool render) -{ -u32 tmp; - -/* Lockout access through VGA aperture*/ - tmp =RREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL)); -if (render) - tmp = tmp &0xFFFFFFEF ; -else - tmp |=0x10 ; - -WREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL), tmp); - -/* disable VGA render */ - tmp =RREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_RENDER_CONTROL)); -if (render) - tmp |=0x10000 ; -else - tmp = tmp &0xFFFCFFFF ; - -WREG32 (SOC15_REG_OFFSET (DCE ,0 , mmVGA_HDP_CONTROL), tmp); -} -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK static const struct amdgpu_display_funcs dm_dce_v8_0_display_funcs = { - .set_vga_render_state = dce_v8_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait = NULL,@@ -1603,7 +1550,6 @@ static const struct amdgpu_display_funcs dm_dce_v8_0_display_funcs = {#endif static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { - .set_vga_render_state = dce_v10_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,@@ -1626,7 +1572,6 @@ static const struct amdgpu_display_funcs dm_dce_v10_0_display_funcs = { };static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = { - .set_vga_render_state = dce_v11_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,@@ -1649,7 +1594,6 @@ static const struct amdgpu_display_funcs dm_dce_v11_0_display_funcs = { };static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = { - .set_vga_render_state = dce_v12_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait =NULL ,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = { · line 1622
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1@@ -1673,7 +1617,6 @@ static const struct amdgpu_display_funcs dm_dce_v12_0_display_funcs = {#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )static const struct amdgpu_display_funcs dm_dcn_v1_0_display_funcs = { - .set_vga_render_state = dcn_v1_0_set_vga_render_state, .bandwidth_update = dm_bandwidth_update,/* called unconditionally */ .vblank_get_counter = dm_vblank_get_counter,/* called unconditionally */ .vblank_wait = NULL,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx