]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/sun4i: Fix uninitialized variables in vi layer
authorJernej Skrabec <jernej.skrabec@siol.net>
Wed, 6 Dec 2017 15:26:03 +0000 (16:26 +0100)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 7 Dec 2017 08:51:41 +0000 (09:51 +0100)
min_scale and max_scale in sun8i_vi_layer_atomic_check() can be used
without initialization.

Fix that.

Fixes: b862a648de3b ("drm/sun4i: Add support for HW scaling to DE2")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171206152603.25937-1-jernej.skrabec@siol.net
drivers/gpu/drm/sun4i/sun8i_vi_layer.c

index e39af8d377d04572a49e1833e73c4057b1d6a4ac..40c3b303068a07dbfb29a17354dd45517f77fe64 100644 (file)
@@ -253,6 +253,9 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
        clip.x2 = crtc_state->adjusted_mode.hdisplay;
        clip.y2 = crtc_state->adjusted_mode.vdisplay;
 
+       min_scale = DRM_PLANE_HELPER_NO_SCALING;
+       max_scale = DRM_PLANE_HELPER_NO_SCALING;
+
        if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) {
                min_scale = SUN8I_VI_SCALER_SCALE_MIN;
                max_scale = SUN8I_VI_SCALER_SCALE_MAX;