Commit 52e527f2 authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Add crtc prefix to vblank functions

parent d9f6e812
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ const struct drm_crtc_funcs gma_crtc_funcs = {
	.set_config = gma_crtc_set_config,
	.destroy = gma_crtc_destroy,
	.page_flip = gma_crtc_page_flip,
	.enable_vblank = gma_enable_vblank,
	.disable_vblank = gma_disable_vblank,
	.get_vblank_counter = gma_get_vblank_counter,
	.enable_vblank = gma_crtc_enable_vblank,
	.disable_vblank = gma_crtc_disable_vblank,
	.get_vblank_counter = gma_crtc_get_vblank_counter,
};

/*
+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ void gma_irq_uninstall(struct drm_device *dev)
	free_irq(pdev->irq, dev);
}

int gma_enable_vblank(struct drm_crtc *crtc)
int gma_crtc_enable_vblank(struct drm_crtc *crtc)
{
	struct drm_device *dev = crtc->dev;
	unsigned int pipe = crtc->index;
@@ -404,7 +404,7 @@ int gma_enable_vblank(struct drm_crtc *crtc)
	return 0;
}

void gma_disable_vblank(struct drm_crtc *crtc)
void gma_crtc_disable_vblank(struct drm_crtc *crtc)
{
	struct drm_device *dev = crtc->dev;
	unsigned int pipe = crtc->index;
@@ -428,7 +428,7 @@ void gma_disable_vblank(struct drm_crtc *crtc)
/* Called from drm generic code, passed a 'crtc', which
 * we use as a pipe index
 */
u32 gma_get_vblank_counter(struct drm_crtc *crtc)
u32 gma_crtc_get_vblank_counter(struct drm_crtc *crtc)
{
	struct drm_device *dev = crtc->dev;
	unsigned int pipe = crtc->index;
+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ void gma_irq_postinstall(struct drm_device *dev);
int  gma_irq_install(struct drm_device *dev, unsigned int irq);
void gma_irq_uninstall(struct drm_device *dev);

int  gma_enable_vblank(struct drm_crtc *crtc);
void gma_disable_vblank(struct drm_crtc *crtc);
u32  gma_get_vblank_counter(struct drm_crtc *crtc);
int  gma_crtc_enable_vblank(struct drm_crtc *crtc);
void gma_crtc_disable_vblank(struct drm_crtc *crtc);
u32  gma_crtc_get_vblank_counter(struct drm_crtc *crtc);
void gma_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
void gma_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);