* Re: [PATCH 01/29] pci: Decouple quirks.c from i915_reg.h
2015-11-04 21:19 ` [PATCH 01/29] pci: Decouple quirks.c from i915_reg.h ville.syrjala
@ 2015-11-05 13:37 ` Chris Wilson
2015-11-24 17:09 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2015-11-05 13:37 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx, Bjorn Helgaas, linux-pci, linux-kernel
On Wed, Nov 04, 2015 at 11:19:49PM +0200, ville.syrjala@linux.intel.com wrote:
> 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 */
Considering this is in a mixed set of quirks, perhaps now would be a
good time to give them an I915_^W IGD_ prefix as well?
But as far as the simple replacement goes,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 01/29] pci: Decouple quirks.c from i915_reg.h
2015-11-04 21:19 ` [PATCH 01/29] pci: Decouple quirks.c from i915_reg.h ville.syrjala
2015-11-05 13:37 ` Chris Wilson
@ 2015-11-24 17:09 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2015-11-24 17:09 UTC (permalink / raw)
To: ville.syrjala; +Cc: intel-gfx, Bjorn Helgaas, linux-pci, linux-kernel
Hi Ville,
On Wed, Nov 04, 2015 at 11:19:49PM +0200, ville.syrjala@linux.intel.com wrote:
> 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>
I haven't seen the rest of this series, but this patch is OK by me,
and I assume you'll merge this along with the whole series. Please
adjust the subject line to be:
PCI: Decouple quirks.c from i915_reg.h
Acked-by: Bjorn Helgaas <bhelgaas@google.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-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread