[PATCH 01/29] pci: Decouple quirks.c from i915_reg.h

From	ville.syrjala@linux.intel.com
Newsgroups	linux.kernel
Subject	[PATCH 01/29] pci: Decouple quirks.c from i915_reg.h
Date	2015-11-04 22:30 +0100
Message-ID	<qrdN0-5Sz-5@gated-at.bofh.it> (permalink)
References	<qrdN0-5Sz-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

i915 register defines are going to become type safe, so going forward
the register defines can't be used as straight numbers. Since quirks.c
needs just a few extra register defines from i915_reg.h, decouple the
two by defining the required registers locally in quirks.c. This was
already done for a few other igpu related registers.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/pci/quirks.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b03373f..78a70fb 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3404,7 +3404,9 @@ static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)
 	return 0;
 }
 
-#include "../gpu/drm/i915/i915_reg.h"
+#define SOUTH_CHICKEN2		0xc2004
+#define PCH_PP_STATUS		0xc7200
+#define PCH_PP_CONTROL		0xc7204
 #define MSG_CTL			0x45010
 #define NSDE_PWR_STATE		0xd0100
 #define IGD_OPERATION_TIMEOUT	10000     /* set timeout 10 seconds */
-- 
2.4.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/29] pci: Decouple quirks.c from i915_reg.h ville.syrjala@linux.intel.com - 2015-11-04 22:30 +0100
  Re: [PATCH 01/29] pci: Decouple quirks.c from i915_reg.h Chris Wilson <chris@chris-wilson.co.uk> - 2015-11-05 14:40 +0100

csiph-web