1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index be9fa8220499..d0299aed517e 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -633,7 +633,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
                 if (!state->bpp[i])
                         return -EINVAL;
 
-                switch (state->base.rotation & 0xf) {
+                switch (state->base.rotation & DRM_ROTATE_MASK) {
                 case BIT(DRM_ROTATE_90):
                         offset = ((y_offset + state->src_y + patched_src_w - 1) /
                                   ydiv) * fb->pitches[i];
@@ -712,11 +712,13 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,
 }
 
 static int atmel_hlcdc_plane_prepare_fb(struct drm_plane *p,
-                                        struct drm_framebuffer *fb,
                                         const struct drm_plane_state *new_state)
 {
         struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);
 
+        if (!new_state->fb)
+                return 0;
+
         return atmel_hlcdc_layer_update_start(&plane->layer);
 }