From: Ville Syrjälä Date: Wed, 4 Nov 2015 21:19:49 +0000 (+0200) Subject: pci: Decouple quirks.c from i915_reg.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aba72ddcfde2ceba0aa3a7188fdc3950a1fdf9f3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Cc: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1446672017-24497-2-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson --- diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b03373fd05ca..78a70fb26d80 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 */