[openchrome-devel] drm-openchrome: Branch 'drm-next-5.6' - 3 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_drv.h  |    4 ++--
 drivers/gpu/drm/openchrome/openchrome_hdmi.c |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 849a3e67d47e7d440cfde321f3986979533b163b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jan 31 12:35:31 2020 -0800

    drm/openchrome: Version bumped to 3.1.25
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index da1452d11548..94686959a998 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -61,10 +61,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	24
+#define DRIVER_PATCHLEVEL	25
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20200120"
+#define DRIVER_DATE		"20200131"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 055e7ed74a3cf2a1d950df0bf53367f1fcd0c7ee
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jan 31 12:33:37 2020 -0800

    drm/openchrome: Explicitly include drm/drm_print.h
    
    This is meant for the use of drm_debug_enabled().  Not really needed
    since drm/drm_drv.h includes drm/drm_print.h.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index 20554351a97b..bccaa17f73e6 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 
 #include <drm/drm_drv.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
 #include "openchrome_drv.h"
commit 6ff0d53de1a3ef0e00c4126718f7fde94ddbb713
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jan 31 12:03:47 2020 -0800

    drm/openchrome: use drm_debug_enabled() to check for debug categories
    
    Based on commit f139a62c7a8fe27d533c6522574f90964f059f3e (drm/amdgpu:
    use drm_debug_enabled() to check for debug categories).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index 6b5f4b4bbab0..20554351a97b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -495,7 +495,7 @@ unsigned int via_ddc_read_bytes_by_hdmi(
 struct edid *
 via_hdmi_get_edid(struct drm_connector *connector)
 {
-	bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);
+	bool print_bad_edid = !connector->bad_edid_counter || (drm_debug_enabled(DRM_UT_KMS));
 	struct openchrome_drm_private *dev_private =
 					connector->dev->dev_private;
 	struct edid *edid = NULL;