CHROMIUM: drm/exynos: don't warn about non-kds modeset

Now that the page_flip logic is shared with the mode_set code,
it's possible for us to call page_flip on a non-kds buffer.
Modify the warning to only check the non-modeset case.

BUG=chrome-os-partner:15349,chrome-os-partner:14965
TEST=dmesg | grep non-kds

Change-Id: I2c23900fffd565886dcccf0e2b79fd04c1b0ab64
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39385
Reviewed-by: Simon Que <sque@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index b7dbe53f2364598c831875b634eec9eaccad3be1..fd642ac62a11956f88e5f5c4ecb759587309737d 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -453,8 +453,13 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
                        goto fail_kds;
                }
        } else {
+               /*
+                * For normal page-flip (i.e. non-modeset) we should
+                * never be flipping a non-kds buffer.
+                */
+               if (event)
+                       DRM_ERROR("flipping a non-kds buffer\n");
                *pkds = NULL;
-               DRM_ERROR("flipping a non-kds buffer\n");
                exynos_drm_kds_callback(fb, pkds);
        }