Commit a29c6f88 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Move gma_intel_crtc_funcs into gma_display.c 



All functions live in gma_display.c already so move the vtable. Also
shorten the name to gma_crtc_funcs.

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220317092555.17882-2-patrik.r.jakobsson@gmail.com
parent 3138ba6e

drivers/gpu/drm/gma500/cdv_device.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ const struct psb_ops cdv_chip_ops = { 
	.errata = cdv_errata,



	.crtc_helper = &cdv_intel_helper_funcs,

	.crtc_funcs = &gma_intel_crtc_funcs,

	.crtc_funcs = &gma_crtc_funcs,

	.clock_funcs = &cdv_clock_funcs,



	.output_init = cdv_output_init,

drivers/gpu/drm/gma500/gma_display.c

+12 −0
Original line number Diff line number Diff line
@@ -565,6 +565,18 @@ int gma_crtc_set_config(struct drm_mode_set *set, 
	return ret;

}



const struct drm_crtc_funcs gma_crtc_funcs = {

	.cursor_set = gma_crtc_cursor_set,

	.cursor_move = gma_crtc_cursor_move,

	.gamma_set = gma_crtc_gamma_set,

	.set_config = gma_crtc_set_config,

	.destroy = gma_crtc_destroy,

	.page_flip = gma_crtc_page_flip,

	.enable_vblank = psb_enable_vblank,

	.disable_vblank = psb_disable_vblank,

	.get_vblank_counter = psb_get_vblank_counter,

};



/*

 * Save HW states of given crtc

 */

drivers/gpu/drm/gma500/gma_display.h

+2 −8
Original line number Diff line number Diff line
@@ -58,15 +58,7 @@ extern bool gma_pipe_has_type(struct drm_crtc *crtc, int type); 
extern void gma_wait_for_vblank(struct drm_device *dev);

extern int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,

			     struct drm_framebuffer *old_fb);

extern int gma_crtc_cursor_set(struct drm_crtc *crtc,

			       struct drm_file *file_priv,

			       uint32_t handle,

			       uint32_t width, uint32_t height);

extern int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);

extern void gma_crtc_load_lut(struct drm_crtc *crtc);

extern int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

			      u16 *blue, u32 size,

			      struct drm_modeset_acquire_ctx *ctx);

extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);

extern void gma_crtc_prepare(struct drm_crtc *crtc);

extern void gma_crtc_commit(struct drm_crtc *crtc);
@@ -83,6 +75,8 @@ extern int gma_crtc_set_config(struct drm_mode_set *set, 
extern void gma_crtc_save(struct drm_crtc *crtc);

extern void gma_crtc_restore(struct drm_crtc *crtc);



extern const struct drm_crtc_funcs gma_crtc_funcs;



extern void gma_encoder_prepare(struct drm_encoder *encoder);

extern void gma_encoder_commit(struct drm_encoder *encoder);

extern void gma_encoder_destroy(struct drm_encoder *encoder);

drivers/gpu/drm/gma500/oaktrail_device.c

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ const struct psb_ops oaktrail_chip_ops = { 
	.chip_setup = oaktrail_chip_setup,

	.chip_teardown = oaktrail_teardown,

	.crtc_helper = &oaktrail_helper_funcs,

	.crtc_funcs = &gma_intel_crtc_funcs,

	.crtc_funcs = &gma_crtc_funcs,



	.output_init = oaktrail_output_init,

drivers/gpu/drm/gma500/psb_device.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ const struct psb_ops psb_chip_ops = { 
	.chip_teardown = psb_chip_teardown,



	.crtc_helper = &psb_intel_helper_funcs,

	.crtc_funcs = &gma_intel_crtc_funcs,

	.crtc_funcs = &gma_crtc_funcs,

	.clock_funcs = &psb_clock_funcs,



	.output_init = psb_output_init,