From: Daniel Stone <daniels@collabora.com>
Date: Thu, 19 Mar 2015 04:33:02 +0000 (+0000)
Subject: drm: mode: Allow NULL modes for equality check
X-Git-Tag: v4.14-rc1~5533^2~19^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54270952e9a83aebf31d16ded28e6757fdf8c88b;p=platform%2Fkernel%2Flinux-rpi.git

drm: mode: Allow NULL modes for equality check

Since we're now using mode == NULL to represent disabled, it's not
wholly surprising that we'd want to compare NULL modes.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 5388596..213b11e 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -903,6 +903,12 @@ EXPORT_SYMBOL(drm_mode_duplicate);
  */
 bool drm_mode_equal(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2)
 {
+	if (!mode1 && !mode2)
+		return true;
+
+	if (!mode1 || !mode2)
+		return false;
+
 	/* do clock check convert to PICOS so fb modes get matched
 	 * the same */
 	if (mode1->clock && mode2->clock) {