Commit aba72ddc authored Nov 04, 2015 by Ville Syrjälä

pci: Decouple quirks.c from i915_reg.h

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>
Link: http://patchwork.freedesktop.org/patch/msgid/1446672017-24497-2-git-send-email-ville.syrjala@linux.intel.com

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

parent 6d8175da

drivers/pci/quirks.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 */