[PATCH v2 2/3] drm/i915/dp: Drop using intel_de_read_notrace()

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

I want to eliminate intel_de_read_notrace() to shrink the
intel_de.h API a bit. That should help with the cleaning out
the remaining uncore mess for xe vs. i915.

Furthermore on xe intel_de_read_notrace() doesn't even do
what it says on the tin, and instead all register accesses
are traced anyway.

Switch the last users of intel_de_read_notrace()
(intel_dp_aux_wait_done() and intel_dp_aux_xfer())
over to the normal intel_de_read().

v2: Drop the trace_i915_reg_rw() as well

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_aux.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
index 3cb07b0a901c..394326d17e0d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
@@ -16,7 +16,6 @@
 #include "intel_pps.h"
 #include "intel_quirks.h"
 #include "intel_tc.h"
-#include "intel_uncore_trace.h"
 
 #define AUX_CH_NAME_BUFSIZE	6
 
@@ -66,7 +65,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp)
 	int ret;
 
 	if (intel_parent_irq_enabled(display)) {
-#define C (((status = intel_de_read_notrace(display, ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
+#define C (((status = intel_de_read(display, ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
 		done = wait_event_timeout(display->gmbus.wait_queue, C,
 					  msecs_to_jiffies_timeout(timeout_ms));
 
@@ -324,13 +323,11 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
 
 	/* Try to wait for any previous AUX channel activity */
 	for (try = 0; try < 3; try++) {
-		status = intel_de_read_notrace(display, ch_ctl);
+		status = intel_de_read(display, ch_ctl);
 		if ((status & DP_AUX_CH_CTL_SEND_BUSY) == 0)
 			break;
 		msleep(1);
 	}
-	/* just trace the final value */
-	trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true);
 
 	if (try == 3) {
 		const u32 status = intel_de_read(display, ch_ctl);
-- 
2.54.0