[PATCH] fix IS_I9XX macro in i915 DRM driver - Kernel

This is a discussion on [PATCH] fix IS_I9XX macro in i915 DRM driver - Kernel ; Now that we're mapping registers in the DRM driver at load time, the driver actually checks the PCI ID, so we need to make sure the macros have all the right bits (and longer term use the DRM headers as ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH] fix IS_I9XX macro in i915 DRM driver

  1. [PATCH] fix IS_I9XX macro in i915 DRM driver

    Now that we're mapping registers in the DRM driver at load time, the driver
    actually checks the PCI ID, so we need to make sure the macros have all the
    right bits (and longer term use the DRM headers as the sole copy of the PCI &
    register definitions).

    This patch adds 945GME support to the DRM headers, fixing a regression
    reported in http://bugzilla.kernel.org/show_bug.cgi?id=10395.

    Dave, please ack asap so this will be fixed in 2.6.25 proper.

    Thanks,
    Jesse

    Tested-by: Alexander Oltu
    Signed-off-by: Jesse Barnes

    diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
    index c10d128..675d88b 100644
    --- a/drivers/char/drm/i915_drv.h
    +++ b/drivers/char/drm/i915_drv.h
    @@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev, int
    n, const char *caller);
    #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device ==
    0x258a)
    #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
    #define IS_I945G(dev) ((dev)->pci_device == 0x2772)
    -#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
    -
    +#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\
    + (dev)->pci_device == 0x27AE)
    #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \
    (dev)->pci_device == 0x2982 || \
    (dev)->pci_device == 0x2992 || \
    --
    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/

  2. Re: [PATCH] fix IS_I9XX macro in i915 DRM driver

    > Now that we're mapping registers in the DRM driver at load time, the driver
    > actually checks the PCI ID, so we need to make sure the macros have all the
    > right bits (and longer term use the DRM headers as the sole copy of the PCI &
    > register definitions).
    >
    > This patch adds 945GME support to the DRM headers, fixing a regression
    > reported in http://bugzilla.kernel.org/show_bug.cgi?id=10395.
    >
    > Dave, please ack asap so this will be fixed in 2.6.25 proper.
    >
    > Thanks,
    > Jesse
    >
    > Tested-by: Alexander Oltu
    > Signed-off-by: Jesse Barnes


    Acked-by: Dave Airlie

    Linus please get into 2.6.25 if possible.

    Dave.

    >
    > diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
    > index c10d128..675d88b 100644
    > --- a/drivers/char/drm/i915_drv.h
    > +++ b/drivers/char/drm/i915_drv.h
    > @@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev, int
    > n, const char *caller);
    > #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device ==
    > 0x258a)
    > #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
    > #define IS_I945G(dev) ((dev)->pci_device == 0x2772)
    > -#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
    > -
    > +#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\
    > + (dev)->pci_device == 0x27AE)
    > #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \
    > (dev)->pci_device == 0x2982 || \
    > (dev)->pci_device == 0x2992 || \
    >
    >

    --
    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/

+ Reply to Thread