From patchwork Wed Jan 5 10:05:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12704199 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 A369DC433EF for ; Wed, 5 Jan 2022 10:05:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE09810E88A; Wed, 5 Jan 2022 10:05:26 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C18EC10E88A for ; Wed, 5 Jan 2022 10:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641377125; x=1672913125; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=r1aJwn3f488wyUMYV9cuTnX7Mc/FGT9ad8XyZckbdGM=; b=ejdHyxscIJQVfAxDySFfCTzbu9AXYPqcHA5ZxczNsEyNNlna9oxu2hkl adW6if17GR69YFCq3gfpAOVyry+r/GJZvYFxUCz0IHezgWmzY+ngWHbmh Tvbs7khSDUa8DSzFGam+QhGzM92zyU77Y9ODHj4qrsC/ZEwULNpM1sguf Ak3I86iQXaFHvLM38pbsWewaogaIVZcw3yvYAXugn3M8RRinhRMiihE7w aTThVrxKWkWoSz3+i4Z0wYZx52uZCs4KhFIgSa8PfUZCB7AvmqZG3dNu1 xQX/B48/IErx3n1LQAxe0b7nGLMBnv1On81VI3eQVRjE9mT/8E0nf9sBV Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="242209180" X-IronPort-AV: E=Sophos;i="5.88,263,1635231600"; d="scan'208";a="242209180" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 02:05:25 -0800 X-IronPort-AV: E=Sophos;i="5.88,263,1635231600"; d="scan'208";a="620987847" Received: from menright-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.25.244]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 02:05:23 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Wed, 5 Jan 2022 12:05:19 +0200 Message-Id: <20220105100520.976092-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h 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: Jani Nikula Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Declarations should be where the implementation is. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_drv.h | 3 --- drivers/gpu/drm/i915/intel_uncore.h | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index beeb42a14aae..e5183743fe93 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1778,9 +1778,6 @@ mkwrite_device_info(struct drm_i915_private *dev_priv) return (struct intel_device_info *)INTEL_INFO(dev_priv); } -int i915_reg_read_ioctl(struct drm_device *dev, void *data, - struct drm_file *file); - static inline int intel_hws_csb_write_index(struct drm_i915_private *i915) { if (GRAPHICS_VER(i915) >= 11) diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 210fe2a71612..3a87bbd906f8 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -32,10 +32,12 @@ #include "i915_reg.h" +struct drm_device; +struct drm_file; struct drm_i915_private; +struct intel_gt; struct intel_runtime_pm; struct intel_uncore; -struct intel_gt; struct intel_uncore_mmio_debug { spinlock_t lock; /** lock is also taken in irq contexts. */ @@ -455,4 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore, #define raw_reg_write(base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) +int i915_reg_read_ioctl(struct drm_device *dev, void *data, + struct drm_file *file); + #endif /* !__INTEL_UNCORE_H__ */ From patchwork Wed Jan 5 10:05:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12704200 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 5B698C433FE for ; Wed, 5 Jan 2022 10:05:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A833510E900; Wed, 5 Jan 2022 10:05:30 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6959710E89E for ; Wed, 5 Jan 2022 10:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641377129; x=1672913129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KgTeRmtJWN4CvVUCHlrgbjmIGhrTSNlqieYFozLt7l4=; b=LfE65cREHvHfddcclZcbaxfns0ejc4QZT1imxZv5vBglM0uabEmj2yLf RHaVC9bTkejEfsHYu7AaU4sVhPI2MqqKrUPLPa9BGwsLr+LxFjP1Id+ty HJvvdBFxZ6EQNyBWzDbl0Y65qivQQlEXs7+yQJayaS4Af6748XMBKyrhp JFj+3uISIvb3EYZi70s1rymHvLgYTmDlxLW5v13N6mDRVY+wY7PvTXAY9 nbf8mES+r66D5sZplHr9cvAd7pSkicMPmrQstxUsp5Btx9CrUpdsF7gcG OwfvdOsRDKYsl1BEWjO301Qfp7lsgk3jXp62mktqdmYHnEWJ6TSE8rqbu g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="241230444" X-IronPort-AV: E=Sophos;i="5.88,263,1635231600"; d="scan'208";a="241230444" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 02:05:29 -0800 X-IronPort-AV: E=Sophos;i="5.88,263,1635231600"; d="scan'208";a="472438312" Received: from menright-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.25.244]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 02:05:27 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Wed, 5 Jan 2022 12:05:20 +0200 Message-Id: <20220105100520.976092-2-jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105100520.976092-1-jani.nikula@intel.com> References: <20220105100520.976092-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl 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: Jani Nikula Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Follow the usual naming convention. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 95174938b160..f9a494e159dc 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE_EXT, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(I915_REG_READ, intel_uncore_reg_read_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW), diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index fc25ebf1a593..33f95bb2d3d5 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl(struct drm_device *dev, - void *data, struct drm_file *file) +int intel_uncore_reg_read_ioctl(struct drm_device *dev, + void *data, struct drm_file *file) { struct drm_i915_private *i915 = to_i915(dev); struct intel_uncore *uncore = &i915->uncore; diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 3a87bbd906f8..697ac4586159 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore, #define raw_reg_write(base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl(struct drm_device *dev, void *data, - struct drm_file *file); +int intel_uncore_reg_read_ioctl(struct drm_device *dev, void *data, + struct drm_file *file); #endif /* !__INTEL_UNCORE_H__ */