Commit 07260855 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hdmi: convert rest of intel_hdmi.c to struct intel_display 



Remove the last uses of struct drm_i915_private from intel_hdmi.c, and
drop the dependency on i915_drv.h.

v2: Rebase

Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/24183605ac919ca115b1b25fa386643409814c82.1746175756.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent aa337e2a

drivers/gpu/drm/i915/display/intel_hdmi.c

+6 −6
Original line number Diff line number Diff line
@@ -38,14 +38,15 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_edid.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/intel/intel_lpe_audio.h>



#include <media/cec-notifier.h>



#include "g4x_hdmi.h"

#include "i915_drv.h"

#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_atomic.h"

#include "intel_audio.h"

#include "intel_connector.h"
@@ -1567,7 +1568,6 @@ bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port, 
				     struct intel_connector *connector)

{

	struct intel_display *display = to_intel_display(dig_port);

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	enum port port = dig_port->base.port;

	enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;

	int ret;
@@ -1580,14 +1580,14 @@ bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port, 
	if (ret)

		return false;



	intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);

	intel_de_write(display, HDCP_RPRIME(display, cpu_transcoder, port), ri.reg);



	/* Wait for Ri prime match */

	if (wait_for((intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &

	if (wait_for((intel_de_read(display, HDCP_STATUS(display, cpu_transcoder, port)) &

		      (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) ==

		     (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {

		drm_dbg_kms(display->drm, "Ri' mismatch detected (%x)\n",

			    intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder,

			    intel_de_read(display, HDCP_STATUS(display, cpu_transcoder,

							       port)));

		return false;

	}