|
@@ -302,9 +302,8 @@ static void ade_set_medianoc_qos(struct ade_crtc *acrtc)
|
|
SOCKET_QOS_EN, SOCKET_QOS_EN);
|
|
SOCKET_QOS_EN, SOCKET_QOS_EN);
|
|
}
|
|
}
|
|
|
|
|
|
-static int ade_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
|
|
+static int ade_crtc_enable_vblank(struct drm_crtc *crtc)
|
|
{
|
|
{
|
|
- struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
struct ade_crtc *acrtc = to_ade_crtc(crtc);
|
|
struct ade_crtc *acrtc = to_ade_crtc(crtc);
|
|
struct ade_hw_ctx *ctx = acrtc->ctx;
|
|
struct ade_hw_ctx *ctx = acrtc->ctx;
|
|
void __iomem *base = ctx->base;
|
|
void __iomem *base = ctx->base;
|
|
@@ -318,9 +317,8 @@ static int ade_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static void ade_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
|
|
+static void ade_crtc_disable_vblank(struct drm_crtc *crtc)
|
|
{
|
|
{
|
|
- struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
struct ade_crtc *acrtc = to_ade_crtc(crtc);
|
|
struct ade_crtc *acrtc = to_ade_crtc(crtc);
|
|
struct ade_hw_ctx *ctx = acrtc->ctx;
|
|
struct ade_hw_ctx *ctx = acrtc->ctx;
|
|
void __iomem *base = ctx->base;
|
|
void __iomem *base = ctx->base;
|
|
@@ -570,6 +568,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = {
|
|
.set_property = drm_atomic_helper_crtc_set_property,
|
|
.set_property = drm_atomic_helper_crtc_set_property,
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
|
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
|
|
|
+ .enable_vblank = ade_crtc_enable_vblank,
|
|
|
|
+ .disable_vblank = ade_crtc_disable_vblank,
|
|
};
|
|
};
|
|
|
|
|
|
static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
|
|
static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
|
|
@@ -1025,8 +1025,6 @@ static int ade_drm_init(struct platform_device *pdev)
|
|
IRQF_SHARED, dev->driver->name, acrtc);
|
|
IRQF_SHARED, dev->driver->name, acrtc);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
- dev->driver->enable_vblank = ade_enable_vblank;
|
|
|
|
- dev->driver->disable_vblank = ade_disable_vblank;
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|