From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73290C2BA83 for ; Thu, 13 Feb 2020 18:37:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56D71222C2 for ; Thu, 13 Feb 2020 18:37:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56D71222C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9EC46E3E1; Thu, 13 Feb 2020 18:37:27 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A5B26E3E1 for ; Thu, 13 Feb 2020 18:37:26 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2020 10:37:26 -0800 X-IronPort-AV: E=Sophos;i="5.70,437,1574150400"; d="scan'208";a="227328092" Received: from unknown (HELO localhost) ([10.252.53.8]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2020 10:37:24 -0800 From: Jani Nikula To: Wambui Karuga In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200211134427.31605-1-jani.nikula@intel.com> Date: Thu, 13 Feb 2020 20:37:50 +0200 Message-ID: <87wo8qwcxt.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 11 Feb 2020, Wambui Karuga wrote: > On Tue, 11 Feb 2020, Jani Nikula wrote: > >> drm->dev_private is to be avoided. Use to_i915() on the struct >> drm_device pointer instead. Rename the affected local dev_priv variables >> to i915 while at it. >> > > Applies cleanly, and compiles. > Changes also look good to me. > > Reviewed by: Wambui Karuga The "Reviewed-by:" tag should include the hyphen. Thanks for the review, pushed to drm-intel-next-queued. BR, Jani. > >> Cc: Wambui Karuga >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++++++++-------------- >> 1 file changed, 10 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c >> index e68bafb76cb1..bee9c9b1a770 100644 >> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c >> @@ -1274,10 +1274,9 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable) >> static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port, >> unsigned int offset, void *buffer, size_t size) >> { >> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); >> struct intel_hdmi *hdmi = &intel_dig_port->hdmi; >> - struct drm_i915_private *dev_priv = >> - intel_dig_port->base.base.dev->dev_private; >> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv, >> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915, >> hdmi->ddc_bus); >> int ret; >> u8 start = offset & 0xff; >> @@ -1304,10 +1303,9 @@ static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port, >> static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port, >> unsigned int offset, void *buffer, size_t size) >> { >> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); >> struct intel_hdmi *hdmi = &intel_dig_port->hdmi; >> - struct drm_i915_private *dev_priv = >> - intel_dig_port->base.base.dev->dev_private; >> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv, >> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915, >> hdmi->ddc_bus); >> int ret; >> u8 *write_buf; >> @@ -1339,10 +1337,9 @@ static >> int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, >> u8 *an) >> { >> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); >> struct intel_hdmi *hdmi = &intel_dig_port->hdmi; >> - struct drm_i915_private *dev_priv = >> - intel_dig_port->base.base.dev->dev_private; >> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv, >> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915, >> hdmi->ddc_bus); >> int ret; >> >> @@ -1521,8 +1518,7 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, >> static >> bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) >> { >> - struct drm_i915_private *dev_priv = >> - intel_dig_port->base.base.dev->dev_private; >> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); >> struct intel_connector *connector = >> intel_dig_port->hdmi.attached_connector; >> enum port port = intel_dig_port->base.port; >> @@ -1537,14 +1533,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) >> if (ret) >> return false; >> >> - intel_de_write(dev_priv, HDCP_RPRIME(dev_priv, cpu_transcoder, port), >> - ri.reg); >> + intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg); >> >> /* Wait for Ri prime match */ >> - if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) & >> + if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) & >> (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) { >> DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n", >> - intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port))); >> + intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port))); >> return false; >> } >> return true; >> -- >> 2.20.1 >> >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx