public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Stuart Summers <stuart.summers@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 03/10] drm/i915: Use local variable for subslice_mask on HSW
Date: Fri,  2 Aug 2019 13:51:27 -0700	[thread overview]
Message-ID: <20190802205134.303-4-stuart.summers@intel.com> (raw)
In-Reply-To: <20190802205134.303-1-stuart.summers@intel.com>

Instead of assuming a single slice on HSW when defining
subslices for the platform, use a local variable to set
the maximum subslices per slice.

Signed-off-by: Stuart Summers <stuart.summers@intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 9a79d9d547c5..2b81cc731fa2 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -541,6 +541,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
 {
 	struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
 	u32 fuse1;
+	u8 subslice_mask;
 	int s, ss;
 
 	/*
@@ -553,16 +554,16 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
 		/* fall through */
 	case 1:
 		sseu->slice_mask = BIT(0);
-		sseu->subslice_mask[0] = BIT(0);
+		subslice_mask = BIT(0);
 		break;
 	case 2:
 		sseu->slice_mask = BIT(0);
-		sseu->subslice_mask[0] = BIT(0) | BIT(1);
+		subslice_mask = BIT(0) | BIT(1);
 		break;
 	case 3:
 		sseu->slice_mask = BIT(0) | BIT(1);
-		sseu->subslice_mask[0] = BIT(0) | BIT(1);
-		sseu->subslice_mask[1] = BIT(0) | BIT(1);
+		subslice_mask = BIT(0) | BIT(1);
+		subslice_mask = BIT(0) | BIT(1);
 		break;
 	}
 
@@ -584,7 +585,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
 	}
 
 	intel_sseu_set_info(sseu, hweight8(sseu->slice_mask),
-			    hweight8(sseu->subslice_mask[0]),
+			    hweight8(subslice_mask),
 			    sseu->eu_per_subslice);
 
 	for (s = 0; s < sseu->max_slices; s++) {
-- 
2.21.0.5.gaeb582a983

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-08-02 20:51 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-02 20:51 [PATCH 00/10] Refactor to expand subslice mask (rev 2) Stuart Summers
2019-08-02 20:51 ` [PATCH 01/10] drm/i915: Use variable for debugfs device status Stuart Summers
2019-08-02 21:24   ` Chris Wilson
2019-08-02 22:47     ` Stuart Summers
2019-08-02 20:51 ` [PATCH 02/10] drm/i915: Add function to set SSEU info per platform Stuart Summers
2019-08-02 20:51 ` Stuart Summers [this message]
2019-08-02 21:28   ` [PATCH 03/10] drm/i915: Use local variable for subslice_mask on HSW Chris Wilson
2019-08-02 22:47     ` Stuart Summers
2019-08-02 22:54       ` Chris Wilson
2019-08-02 23:52         ` Stuart Summers
2019-08-02 20:51 ` [PATCH 04/10] drm/i915: Add subslice stride runtime parameter Stuart Summers
2019-08-02 20:51 ` [PATCH 05/10] drm/i915: Add EU " Stuart Summers
2019-08-02 20:51 ` [PATCH 06/10] drm/i915: Add function to set subslices Stuart Summers
2019-08-02 20:51 ` [PATCH 07/10] drm/i915: Add function to determine if a slice has a subslice Stuart Summers
2019-08-02 20:51 ` [PATCH 08/10] drm/i915: Refactor instdone loops on new subslice functions Stuart Summers
2019-08-02 20:51 ` [PATCH 09/10] drm/i915: Add new function to copy subslices for a slice Stuart Summers
2019-08-02 20:51 ` [PATCH 10/10] drm/i915: Expand subslice mask Stuart Summers
2019-08-02 21:00 ` ✗ Fi.CI.CHECKPATCH: warning for Refactor to expand subslice mask (rev 2) Patchwork
2019-08-02 21:21 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-04 13:45 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190802205134.303-4-stuart.summers@intel.com \
    --to=stuart.summers@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox