Commit 76feffd1 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Don't store crtc_funcs in psb_ops 



The drm_crtc_funcs are all generic and no chip specific functions are
necessary. We can therefore directly put gma_crtc_funcs into the
drm_crtc.

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-3-patrik.r.jakobsson@gmail.com
parent a29c6f88

drivers/gpu/drm/gma500/cdv_device.c

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



	.crtc_helper = &cdv_intel_helper_funcs,

	.crtc_funcs = &gma_crtc_funcs,

	.clock_funcs = &cdv_clock_funcs,



	.output_init = cdv_output_init,

drivers/gpu/drm/gma500/oaktrail_device.c

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

	.chip_teardown = oaktrail_teardown,

	.crtc_helper = &oaktrail_helper_funcs,

	.crtc_funcs = &gma_crtc_funcs,



	.output_init = oaktrail_output_init,

drivers/gpu/drm/gma500/psb_device.c

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



	.crtc_helper = &psb_intel_helper_funcs,

	.crtc_funcs = &gma_crtc_funcs,

	.clock_funcs = &psb_clock_funcs,



	.output_init = psb_output_init,

drivers/gpu/drm/gma500/psb_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ struct psb_ops { 


	/* Sub functions */

	struct drm_crtc_helper_funcs const *crtc_helper;

	struct drm_crtc_funcs const *crtc_funcs;

	const struct gma_clock_funcs *clock_funcs;



	/* Setup hooks */

drivers/gpu/drm/gma500/psb_intel_display.c

+1 −2
Original line number Diff line number Diff line
@@ -488,8 +488,7 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, 
		return;

	}



	/* Set the CRTC operations from the chip specific data */

	drm_crtc_init(dev, &gma_crtc->base, dev_priv->ops->crtc_funcs);

	drm_crtc_init(dev, &gma_crtc->base, &gma_crtc_funcs);



	/* Set the CRTC clock functions from chip specific data */

	gma_crtc->clock_funcs = dev_priv->ops->clock_funcs;