[PATCHv4 21/36] drm/komeda: Make the size checks independent from framebuffer structure

Andrzej Pietrasiewicz
2019-12-13T21:24:58Z

The same data is available in mode_cmd.

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

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
index 4c78ae1a4845..ab067f89533c 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
@@ -156,9 +156,9 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
goto err_free;

drm_helper_mode_fill_fb_struct(dev, &kfb->base, mode_cmd);
- info = kfb->base.format;
+ info = drm_get_format_info(dev, mode_cmd);

- if (kfb->base.modifier) {
+ if (mode_cmd->modifier[0]) {
if (info->num_planes != 1) {
DRM_DEBUG_KMS("AFBC requires exactly 1 plane.\n");
ret = -EINVAL;
@@ -168,8 +168,8 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
ret = komeda_fb_afbc_size_check(kfb, info, objs, file,
mode_cmd);
} else {
- ret = komeda_fb_check_src_coords(kfb, 0, 0, kfb->base.width,
- kfb->base.height);
+ ret = komeda_fb_check_src_coords(kfb, 0, 0, mode_cmd->width,
+ mode_cmd->height);
if (ret)
goto err_cleanup;

@@ -180,7 +180,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
goto err_cleanup;

if (info->num_planes == 3)
- if (kfb->base.pitches[1] != kfb->base.pitches[2]) {
+ if (mode_cmd->pitches[1] != mode_cmd->pitches[2]) {
DRM_DEBUG_KMS("The pitch[1] and [2] are not same\n");
ret = -EINVAL;
goto err_cleanup;