disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/i2c/sil164_drv.c
..
..
@@ -26,9 +26,10 @@
26
26
 
27
27
 #include <linux/module.h>
28
28
 
29
-#include <drm/drmP.h>
30
-#include <drm/drm_crtc_helper.h>
29
+#include <drm/drm_drv.h>
31
30
 #include <drm/drm_encoder_slave.h>
31
+#include <drm/drm_print.h>
32
+#include <drm/drm_probe_helper.h>
32
33
 #include <drm/i2c/sil164.h>
33
34
 
34
35
 struct sil164_priv {
..
..
@@ -43,7 +44,7 @@
43
44
 	((struct sil164_priv *)to_encoder_slave(x)->slave_priv)
44
45
 
45
46
 #define sil164_dbg(client, format, ...) do {				\
46
-		if (drm_debug & DRM_UT_KMS)				\
47
+		if (drm_debug_enabled(DRM_UT_KMS))			\
47
48
 			dev_printk(KERN_DEBUG, &client->dev,		\
48
49
 				   "%s: " format, __func__, ## __VA_ARGS__); \
49
50
 	} while (0)
..
..
@@ -392,7 +393,7 @@
392
393
 		return NULL;
393
394
 	}
394
395
 
395
-	return i2c_new_device(adap, &info);
396
+	return i2c_new_client_device(adap, &info);
396
397
 }
397
398
 
398
399
 static int
..
..
@@ -401,6 +402,7 @@
401
402
 		    struct drm_encoder_slave *encoder)
402
403
 {
403
404
 	struct sil164_priv *priv;
405
+	struct i2c_client *slave_client;
404
406
 
405
407
 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
406
408
 	if (!priv)
..
..
@@ -409,7 +411,9 @@
409
411
 	encoder->slave_priv = priv;
410
412
 	encoder->slave_funcs = &sil164_encoder_funcs;
411
413
 
412
-	priv->duallink_slave = sil164_detect_slave(client);
414
+	slave_client = sil164_detect_slave(client);
415
+	if (!IS_ERR(slave_client))
416
+		priv->duallink_slave = slave_client;
413
417
 
414
418
 	return 0;
415
419
 }