Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/gma500/cdv: Convert to generic set_config()

parent 43a83027
Loading
Loading
Loading
Loading
+1 −20
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@
 */
 */


#include <linux/i2c.h>
#include <linux/i2c.h>
#include <linux/pm_runtime.h>


#include <drm/drmP.h>
#include <drm/drmP.h>
#include "framebuffer.h"
#include "framebuffer.h"
@@ -867,24 +866,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
	return 0;
	return 0;
}
}


static int cdv_crtc_set_config(struct drm_mode_set *set)
{
	int ret = 0;
	struct drm_device *dev = set->crtc->dev;
	struct drm_psb_private *dev_priv = dev->dev_private;

	if (!dev_priv->rpm_enabled)
		return drm_crtc_helper_set_config(set);

	pm_runtime_forbid(&dev->pdev->dev);

	ret = drm_crtc_helper_set_config(set);

	pm_runtime_allow(&dev->pdev->dev);

	return ret;
}

/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */


/* FIXME: why are we using this, should it be cdv_ in this tree ? */
/* FIXME: why are we using this, should it be cdv_ in this tree ? */
@@ -1040,7 +1021,7 @@ const struct drm_crtc_funcs cdv_intel_crtc_funcs = {
	.cursor_set = gma_crtc_cursor_set,
	.cursor_set = gma_crtc_cursor_set,
	.cursor_move = gma_crtc_cursor_move,
	.cursor_move = gma_crtc_cursor_move,
	.gamma_set = gma_crtc_gamma_set,
	.gamma_set = gma_crtc_gamma_set,
	.set_config = cdv_crtc_set_config,
	.set_config = gma_crtc_set_config,
	.destroy = gma_crtc_destroy,
	.destroy = gma_crtc_destroy,
};
};