lkml.org 
[lkml]   [2011]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] drm/i915: iommu workaround related cleanups
    On Tue,  1 Nov 2011 11:29:49 -0700
    Ben Widawsky <ben@bwidawsk.net> wrote:

    > Cleanups recommended by Dave Airlie.
    >
    > Cc: Keith Packard <keithp@keithp.com>
    > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
    > ---
    > drivers/char/agp/intel-agp.h | 6 ++++++
    > drivers/char/agp/intel-gtt.c | 7 ++++---
    > 2 files changed, 10 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
    > index 5da67f1..d8fa7d6 100644
    > --- a/drivers/char/agp/intel-agp.h
    > +++ b/drivers/char/agp/intel-agp.h
    > @@ -238,4 +238,10 @@
    > int intel_gmch_probe(struct pci_dev *pdev,
    > struct agp_bridge_data *bridge);
    > void intel_gmch_remove(struct pci_dev *pdev);
    > +
    > +#ifdef CONFIG_INTEL_IOMMU
    > +/* This is a special note from the iommu driver that we are mapped through it */
    > +extern int intel_iommu_gfx_mapped;
    > +#endif
    > +
    > #endif
    > diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
    > index c92424c..11985fb 100644
    > --- a/drivers/char/agp/intel-gtt.c
    > +++ b/drivers/char/agp/intel-gtt.c
    > @@ -1183,14 +1183,13 @@ static void gen6_cleanup(void)
    > {
    > }
    >
    > +#ifdef CONFIG_INTEL_IOMMU
    > /* Certain Gen5 chipsets require require idling the GPU before
    > * unmapping anything from the GTT when VT-d is enabled.
    > */
    > static inline int needs_idle_maps(void)
    > {
    > -#ifdef CONFIG_INTEL_IOMMU
    > const unsigned short gpu_devid = intel_private.pcidev->device;
    > - extern int intel_iommu_gfx_mapped;
    >
    > /* Query intel_iommu to see if we need the workaround. Presumably that
    > * was loaded first.
    > @@ -1199,9 +1198,11 @@ static inline int needs_idle_maps(void)
    > gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
    > intel_iommu_gfx_mapped)
    > return 1;
    > -#endif
    > return 0;
    > }
    > +#else
    > +static inline bool needs_idle_maps(void) { return false; }
    > +#endif
    >
    > static int i9xx_setup(void)
    > {


    I should have kept the ints and bools consistent. So if this patch looks
    interesting to anyone, let's just say:

    +#else
    +static inline int needs_idle_maps(void) { return 0; }
    +#endif



    \
     
     \ /
      Last update: 2011-11-01 22:27    [W:0.023 / U:124.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site