Commit 93b0bb58 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Unify crtc helpers 



CDV crtc helpers are identical to other chips so use gma_ prefix for the
crtc helper struct and remove the CDV copy.

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210201132617.1233-4-patrik.r.jakobsson@gmail.com
parent 45c7f1b4

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 = &cdv_intel_crtc_funcs,

	.crtc_funcs = &gma_intel_crtc_funcs,

	.clock_funcs = &cdv_clock_funcs,



	.output_init = cdv_output_init,

drivers/gpu/drm/gma500/cdv_device.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ struct drm_device; 
struct psb_intel_mode_device;



extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;

extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;

extern const struct gma_clock_funcs cdv_clock_funcs;

extern void cdv_intel_crt_init(struct drm_device *dev,

			struct psb_intel_mode_device *mode_dev);

drivers/gpu/drm/gma500/cdv_intel_display.c

+0 −12
Original line number Diff line number Diff line
@@ -961,18 +961,6 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { 
	.disable = gma_crtc_disable,

};



const struct drm_crtc_funcs cdv_intel_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,

};



const struct gma_clock_funcs cdv_clock_funcs = {

	.clock = cdv_intel_clock,

	.limit = cdv_intel_limit,

drivers/gpu/drm/gma500/oaktrail_device.c

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

	.chip_teardown = oaktrail_teardown,

	.crtc_helper = &oaktrail_helper_funcs,

	.crtc_funcs = &psb_intel_crtc_funcs,

	.crtc_funcs = &gma_intel_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 = &psb_intel_crtc_funcs,

	.crtc_funcs = &gma_intel_crtc_funcs,

	.clock_funcs = &psb_clock_funcs,



	.output_init = psb_output_init,