xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/armada: allocate primary plane ourselves

Browse Source 
Allocate our own primary plane as an armada_plane.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2015-07-15 18:11:24 +01:00
parent 1c914cecb5
commit de32301b86
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/armada/armada_crtc.c
View File

@@ -1059,6 +1059,12 @@ static struct drm_crtc_funcs armada_crtc_funcs = {
.set_property = armada_drm_crtc_set_property, .set_property = armada_drm_crtc_set_property,
}; };
static const struct drm_plane_funcs armada_primary_plane_funcs = {
.update_plane = drm_primary_helper_update,
.disable_plane = drm_primary_helper_disable,
.destroy = drm_primary_helper_destroy,
};
static struct drm_prop_enum_list armada_drm_csc_yuv_enum_list[] = { static struct drm_prop_enum_list armada_drm_csc_yuv_enum_list[] = {
{ CSC_AUTO, "Auto" }, { CSC_AUTO, "Auto" },
{ CSC_YUV_CCIR601, "CCIR601" }, { CSC_YUV_CCIR601, "CCIR601" },
@@ -1097,7 +1103,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
{ {
struct armada_private *priv = drm->dev_private; struct armada_private *priv = drm->dev_private;
struct armada_crtc *dcrtc; struct armada_crtc *dcrtc;
struct drm_plane *primary; struct armada_plane *primary;
void __iomem *base; void __iomem *base;
int ret; int ret;
@@ -1167,12 +1173,21 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
dcrtc->crtc.port = port; dcrtc->crtc.port = port;
primary = drm_primary_helper_create_plane(drm, armada_primary_formats, primary = kzalloc(sizeof(*primary), GFP_KERNEL);
ARRAY_SIZE(armada_primary_formats));
if (!primary) if (!primary)
return -ENOMEM; return -ENOMEM;
ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, primary, NULL, ret = drm_universal_plane_init(drm, &primary->base, 0,
&armada_primary_plane_funcs,
armada_primary_formats,
ARRAY_SIZE(armada_primary_formats),
DRM_PLANE_TYPE_PRIMARY);
if (ret) {
kfree(primary);
return ret;
}
ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL,
&armada_crtc_funcs); &armada_crtc_funcs);
if (ret) if (ret)
goto err_crtc_init; goto err_crtc_init;
@@ -1187,7 +1202,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
return armada_overlay_plane_create(drm, 1 << dcrtc->num); return armada_overlay_plane_create(drm, 1 << dcrtc->num);
err_crtc_init: err_crtc_init:
primary->funcs->destroy(primary); primary->base.funcs->destroy(&primary->base);
return ret; return ret;
} }