Merge tag 'topic/hdcp-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 69ff763..46733d5 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -390,7 +390,7 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
 
        if (blob) {
                if (blob->length != sizeof(struct drm_mode_modeinfo) ||
-                   drm_mode_convert_umode(&state->mode,
+                   drm_mode_convert_umode(state->crtc->dev, &state->mode,
                                           (const struct drm_mode_modeinfo *)
                                            blob->data))
                        return -EINVAL;
@@ -863,10 +863,10 @@ static int drm_atomic_plane_check(struct drm_plane *plane,
        int ret;
 
        /* either *both* CRTC and FB must be set, or neither */
-       if (WARN_ON(state->crtc && !state->fb)) {
+       if (state->crtc && !state->fb) {
                DRM_DEBUG_ATOMIC("CRTC set but no FB\n");
                return -EINVAL;
-       } else if (WARN_ON(state->fb && !state->crtc)) {
+       } else if (state->fb && !state->crtc) {
                DRM_DEBUG_ATOMIC("FB set but no CRTC\n");
                return -EINVAL;
        }