Skip to content

Commit f5255f9

Browse files
committed
drm/i915/fb: Init 'ret' in each error branch in intel_framebuffer_init()
Make the order of things a bit less fragile in intel_framebuffer_init() by assigning 'ret' in each error branch instead of depending on some earlier assignment. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20251107181126.5743-6-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
1 parent 13fad66 commit f5255f9

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/gpu/drm/i915/display/intel_fb.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2234,13 +2234,13 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22342234
if (ret)
22352235
goto err_frontbuffer_put;
22362236

2237-
ret = -EINVAL;
22382237
if (!drm_any_plane_has_format(display->drm,
22392238
mode_cmd->pixel_format,
22402239
mode_cmd->modifier[0])) {
22412240
drm_dbg_kms(display->drm,
22422241
"unsupported pixel format %p4cc / modifier 0x%llx\n",
22432242
&mode_cmd->pixel_format, mode_cmd->modifier[0]);
2243+
ret = -EINVAL;
22442244
goto err_bo_framebuffer_fini;
22452245
}
22462246

@@ -2251,6 +2251,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22512251
mode_cmd->modifier[0] != DRM_FORMAT_MOD_LINEAR ?
22522252
"tiled" : "linear",
22532253
mode_cmd->pitches[0], max_stride);
2254+
ret = -EINVAL;
22542255
goto err_bo_framebuffer_fini;
22552256
}
22562257

@@ -2259,6 +2260,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22592260
drm_dbg_kms(display->drm,
22602261
"plane 0 offset (0x%08x) must be 0\n",
22612262
mode_cmd->offsets[0]);
2263+
ret = -EINVAL;
22622264
goto err_bo_framebuffer_fini;
22632265
}
22642266

@@ -2269,6 +2271,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22692271

22702272
if (mode_cmd->handles[i] != mode_cmd->handles[0]) {
22712273
drm_dbg_kms(display->drm, "bad plane %d handle\n", i);
2274+
ret = -EINVAL;
22722275
goto err_bo_framebuffer_fini;
22732276
}
22742277

@@ -2277,6 +2280,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22772280
drm_dbg_kms(display->drm,
22782281
"plane %d pitch (%d) must be at least %u byte aligned\n",
22792282
i, fb->pitches[i], stride_alignment);
2283+
ret = -EINVAL;
22802284
goto err_bo_framebuffer_fini;
22812285
}
22822286

@@ -2287,6 +2291,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
22872291
drm_dbg_kms(display->drm,
22882292
"ccs aux plane %d pitch (%d) must be %d\n",
22892293
i, fb->pitches[i], ccs_aux_stride);
2294+
ret = -EINVAL;
22902295
goto err_bo_framebuffer_fini;
22912296
}
22922297
}

0 commit comments

Comments
 (0)