> -----Original Message----- > From: Alex Deucher [mailto:alexdeucher at gmail.com] > Sent: Thursday, June 15, 2017 2:56 PM > To: amd-gfx at lists.freedesktop.org > Cc: Deucher, Alexander > Subject: [PATCH] drm/amdgpu: drop set_vga_render_state from display > funcs > > Not used. > > Reviewed-by: Christian König <christian.koenig at amd.com> > Signed-off-by: Alex Deucher <alexander.deucher at amd.com> Didnâ??t mean to send this out. Ignore for now. Alex > --- > 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 | 1 - > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 - > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 - > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 ------- > 7 files changed, 14 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index fc7e8a3..5934615 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1890,7 +1890,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)) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > index 43a9d3a..35bd93c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h > @@ -264,8 +264,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 */ > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index 0cdeb6a..35906f9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -3734,7 +3734,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, > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 773654a..c3113e6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -3803,7 +3803,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, > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index fae535b..3ba29ea 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -3522,7 +3522,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, > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index 3c558c1..70ebd7e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -3571,7 +3571,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, > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c > b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c > index f1b479b..944dda0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c > @@ -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 > * > @@ -677,7 +671,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, > -- > 2.5.5
