[PATCHv5 10/34] drm/komeda: Move pitches comparison to komeda_fb_create

Andrzej Pietrasiewicz
2019-12-17T14:52:51Z

For AFBC case num_planes equals 1 so the check will not affect it.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
.../drm/arm/display/komeda/komeda_framebuffer.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
index c0bc499a9c29..5d035f6a76a6 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
@@ -132,13 +132,6 @@ komeda_fb_none_afbc_size_check(struct komeda_dev *mdev,
}
}

- if (info->num_planes == 3) {
- if (fb->pitches[1] != fb->pitches[2]) {
- DRM_DEBUG_KMS("The pitch[1] and [2] are not same\n");
- return -EINVAL;
- }
- }
-
return 0;
}

@@ -188,6 +181,13 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
if (ret < 0)
goto err_cleanup;

+ if (info->num_planes == 3)
+ if (kfb->base.pitches[1] != kfb->base.pitches[2]) {
+ DRM_DEBUG_KMS("The pitch[1] and [2] are not same\n");
+ ret = -EINVAL;
+ goto err_cleanup;
+ }
+
ret = drm_framebuffer_init(dev, &kfb->base, &komeda_fb_funcs);
if (ret < 0) {
DRM_DEBUG_KMS("failed to initialize fb\n");