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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C4734C433EF for ; Mon, 7 Feb 2022 11:02:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 046C710F812; Mon, 7 Feb 2022 11:02:11 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id EEAB010F812 for ; Mon, 7 Feb 2022 11:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644231729; x=1675767729; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=9lU6l8ERjP64G0LN4dKAoaYjaMThNRSCYkVhIV9EoT4=; b=R4BfNqdlYiS59fJ5BaKv3pycBX86JIXtlecZdyFxWnl6zFTaMEeY42z7 ybcOkp7IabTzex0XXPaBT3GpfABFktdcTxA0GEdFEoyX+q2wxRBsUrI9w otaAiBuOYgGxWwAZGhaPiYvrGFBKpUL8EYx4vIpO73K8ih576Zp8iIjIR dgw1Bn8Nb80oL8Grg8L62deAKfLmUAae9HA7SWeoWkWDaxoBkET0EtFsr 1rLa/YMb0ZPUp9kN1RIdeUkv9/9/kOkwEUxUFqUzw1c78//l+d7eyeWOB XbSOABq2yQMxFLfFZq54JvoUdwZvctuleem861DfdB+brIW7wBBgsIMaG A==; X-IronPort-AV: E=McAfee;i="6200,9189,10250"; a="228662149" X-IronPort-AV: E=Sophos;i="5.88,349,1635231600"; d="scan'208";a="228662149" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 03:02:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,349,1635231600"; d="scan'208";a="481549553" Received: from nbaca1-mobl.ger.corp.intel.com (HELO localhost) ([10.252.18.25]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 03:02:07 -0800 From: Jani Nikula To: Anshuman Gupta , intel-gfx@lists.freedesktop.org In-Reply-To: <20220206144311.5053-3-anshuman.gupta@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220206144311.5053-1-anshuman.gupta@intel.com> <20220206144311.5053-3-anshuman.gupta@intel.com> Date: Mon, 07 Feb 2022 13:02:01 +0200 Message-ID: <871r0frlcm.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH 2/4] drm/i915/opregion: Register opreg func only for disp parts 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: lucas.demarchi@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Sun, 06 Feb 2022, Anshuman Gupta wrote: > It need to register opregion_func only for graphics sku > which has display. Use HAS_DISPLAY() to register > opregion_func. > > Cc: Badal Nilawar > Cc: Jani Nikula > Cc: Uma Shankar > Signed-off-by: Anshuman Gupta > --- > drivers/gpu/drm/i915/display/intel_opregion.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index 19f0558c0fbf..c1b558cdb99e 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -860,6 +860,9 @@ static int intel_opregion_setup(struct drm_i915_private *dev_priv) > BUILD_BUG_ON(sizeof(struct opregion_asle) != 0x100); > BUILD_BUG_ON(sizeof(struct opregion_asle_ext) != 0x400); > > + if (!opregion->opregion_func) > + return 0; > + > INIT_WORK(&opregion->asle_work, asle_work); > > base = opregion->opregion_func->alloc_opregion(dev_priv); > @@ -1296,9 +1299,9 @@ int intel_opregion_init(struct drm_i915_private *i915) > { > struct intel_opregion *opregion = &i915->opregion; > > - if (IS_DGFX(i915)) > + if (IS_DGFX(i915) && HAS_DISPLAY(i915)) > opregion->opregion_func = &dgfx_opregion_func; > - else > + else if (!IS_DGFX(i915)) > opregion->opregion_func = &igfx_opregion_func; This does not match the commit message. I don't know whether the code or the commit message is right. BR, Jani. > > return intel_opregion_setup(i915); -- Jani Nikula, Intel Open Source Graphics Center