|
@@ -299,12 +299,13 @@ static void exynos_drm_crtc_attach_mode_property(struct drm_crtc *crtc)
|
|
drm_object_attach_property(&crtc->base, prop, 0);
|
|
drm_object_attach_property(&crtc->base, prop, 0);
|
|
}
|
|
}
|
|
|
|
|
|
-int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe,
|
|
|
|
|
|
+int exynos_drm_crtc_create(struct exynos_drm_manager *manager,
|
|
|
|
+ struct drm_device *drm_dev, int pipe,
|
|
enum exynos_drm_output_type type)
|
|
enum exynos_drm_output_type type)
|
|
{
|
|
{
|
|
struct exynos_drm_crtc *exynos_crtc;
|
|
struct exynos_drm_crtc *exynos_crtc;
|
|
struct drm_plane *plane;
|
|
struct drm_plane *plane;
|
|
- struct exynos_drm_private *private = manager->drm_dev->dev_private;
|
|
|
|
|
|
+ struct exynos_drm_private *private = drm_dev->dev_private;
|
|
struct drm_crtc *crtc;
|
|
struct drm_crtc *crtc;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -319,7 +320,7 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe,
|
|
exynos_crtc->manager = manager;
|
|
exynos_crtc->manager = manager;
|
|
exynos_crtc->pipe = pipe;
|
|
exynos_crtc->pipe = pipe;
|
|
exynos_crtc->type = type;
|
|
exynos_crtc->type = type;
|
|
- plane = exynos_plane_init(manager->drm_dev, 1 << pipe,
|
|
|
|
|
|
+ plane = exynos_plane_init(drm_dev, 1 << pipe,
|
|
DRM_PLANE_TYPE_PRIMARY);
|
|
DRM_PLANE_TYPE_PRIMARY);
|
|
if (IS_ERR(plane)) {
|
|
if (IS_ERR(plane)) {
|
|
ret = PTR_ERR(plane);
|
|
ret = PTR_ERR(plane);
|
|
@@ -331,7 +332,7 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager, int pipe,
|
|
|
|
|
|
private->crtc[pipe] = crtc;
|
|
private->crtc[pipe] = crtc;
|
|
|
|
|
|
- ret = drm_crtc_init_with_planes(manager->drm_dev, crtc, plane, NULL,
|
|
|
|
|
|
+ ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL,
|
|
&exynos_crtc_funcs);
|
|
&exynos_crtc_funcs);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
goto err_crtc;
|
|
goto err_crtc;
|