Merge tag 'drm-intel-next-2024-02-27-1' of git://anongit.freedesktop.org/drm/drm...

[thirdparty/linux.git] / drivers / gpu / drm / display / drm_dp_helper.c

diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c
index d9f8581a5a5f1a220c4904808deec3f2dbea5132..d046dfa79504f9c5368aaf2a0bd87c2e1d84f4b7 100644 (file)
--- a/drivers/gpu/drm/display/drm_dp_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_helper.c
@@ -2102,7 +2102,6 @@ int drm_dp_aux_register(struct drm_dp_aux *aux)
        if (!aux->ddc.algo)
                drm_dp_aux_init(aux);
 
-       aux->ddc.class = I2C_CLASS_DDC;
        aux->ddc.owner = THIS_MODULE;
        aux->ddc.dev.parent = aux->dev;
 
@@ -2898,22 +2897,19 @@ static const char *dp_content_type_get_name(enum dp_content_type content_type)
        }
 }
 
-void drm_dp_vsc_sdp_log(const char *level, struct device *dev,
-                       const struct drm_dp_vsc_sdp *vsc)
+void drm_dp_vsc_sdp_log(struct drm_printer *p, const struct drm_dp_vsc_sdp *vsc)
 {
-#define DP_SDP_LOG(fmt, ...) dev_printk(level, dev, fmt, ##__VA_ARGS__)
-       DP_SDP_LOG("DP SDP: %s, revision %u, length %u\n", "VSC",
+       drm_printf(p, "DP SDP: VSC, revision %u, length %u\n",
                   vsc->revision, vsc->length);
-       DP_SDP_LOG("    pixelformat: %s\n",
+       drm_printf(p, "    pixelformat: %s\n",
                   dp_pixelformat_get_name(vsc->pixelformat));
-       DP_SDP_LOG("    colorimetry: %s\n",
+       drm_printf(p, "    colorimetry: %s\n",
                   dp_colorimetry_get_name(vsc->pixelformat, vsc->colorimetry));
-       DP_SDP_LOG("    bpc: %u\n", vsc->bpc);
-       DP_SDP_LOG("    dynamic range: %s\n",
+       drm_printf(p, "    bpc: %u\n", vsc->bpc);
+       drm_printf(p, "    dynamic range: %s\n",
                   dp_dynamic_range_get_name(vsc->dynamic_range));
-       DP_SDP_LOG("    content type: %s\n",
+       drm_printf(p, "    content type: %s\n",
                   dp_content_type_get_name(vsc->content_type));
-#undef DP_SDP_LOG
 }
 EXPORT_SYMBOL(drm_dp_vsc_sdp_log);