On Monday 08 December 2014 11:57 PM, Mika Kuoppala wrote:
Forcewake domain code uses unsigned int as a type for 'domains mask'.
Bring the hw accessors inline with this.
Suggested-by: Chris Wilson <ch...@chris-wilson.co.uk>
Signed-off-by: Mika Kuoppala <mika.kuopp...@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
drivers/gpu/drm/i915/intel_uncore.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a2a8536..917614e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -535,9 +535,9 @@ struct drm_i915_display_funcs {
struct intel_uncore_funcs {
void (*force_wake_get)(struct drm_i915_private *dev_priv,
- int fw_engine);
+ unsigned fw_domains);
void (*force_wake_put)(struct drm_i915_private *dev_priv,
- int fw_engine);
+ unsigned fw_domains);
uint8_t (*mmio_readb)(struct drm_i915_private *dev_priv, off_t offset, bool trace);
uint16_t (*mmio_readw)(struct drm_i915_private *dev_priv, off_t offset,
bool trace);
diff --git a/drivers/gpu/drm/i915/intel_uncore.c
b/drivers/gpu/drm/i915/intel_uncore.c
index 509b9c9..be02aab 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -122,7 +122,7 @@ fw_domain_posting_read(const struct
intel_uncore_forcewake_domain *d)
}
static void
-fw_domains_get(struct drm_i915_private *dev_priv, int fw_domains)
+fw_domains_get(struct drm_i915_private *dev_priv, unsigned fw_domains)
{
struct intel_uncore_forcewake_domain *d;
int id;
@@ -136,7 +136,7 @@ fw_domains_get(struct drm_i915_private *dev_priv, int
fw_domains)
}
static void
-fw_domains_put(struct drm_i915_private *dev_priv, int fw_domains)
+fw_domains_put(struct drm_i915_private *dev_priv, unsigned fw_domains)
{
struct intel_uncore_forcewake_domain *d;
int id;
@@ -181,7 +181,7 @@ static void __gen6_gt_wait_for_thread_c0(struct
drm_i915_private *dev_priv)
}
static void fw_domains_get_with_thread_status(struct drm_i915_private *dev_priv,
- int fw_domains)
+ unsigned fw_domains)
{
fw_domains_get(dev_priv, fw_domains);
@@ -199,7 +199,7 @@ static void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv)
}
static void fw_domains_put_with_fifo(struct drm_i915_private *dev_priv,
- int fw_domains)
+ unsigned fw_domains)
{
fw_domains_put(dev_priv, fw_domains);
gen6_gt_check_fifodbg(dev_priv);
Looks fine
Reviewed-by: Deepak S<deepa...@linux.intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
