1. 23 May, 2011 5 commits
  2. 22 May, 2011 8 commits
  3. 20 May, 2011 19 commits
  4. 18 May, 2011 2 commits
  5. 17 May, 2011 3 commits
  6. 16 May, 2011 3 commits
    • Feng, Boqun's avatar
      drm/i915: clean up unused ring_get_irq/ring_put_irq functions · 8547920f
      Feng, Boqun authored
      This patch depends on patch "drm/i915: fix user irq miss in BSD ring on
      g4x".
      Once the previous patch apply, ring_get_irq/ring_put_irq become unused.
      So simply remove them.
      Signed-off-by: default avatarFeng, Boqun <boqun.feng@intel.com>
      Reviewed-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
      Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
      8547920f
    • Feng, Boqun's avatar
      drm/i915: fix user irq miss in BSD ring on g4x · 5bfa1063
      Feng, Boqun authored
      On g4x, user interrupt in BSD ring is missed.
      This is because though g4x and ironlake share the same bsd_ring,
      their interrupt control interfaces have _two_ differences.
      
      1.different irq enable/disable functions:
      On g4x are i915_enable_irq and i915_disable_irq.
      On ironlake are ironlake_enable_irq and ironlake_disable_irq.
      2.different irq flag:
      On g4x user interrupt flag in BSD ring on is I915_BSD_USER_INTERRUPT.
      On ironlake is GT_BSD_USER_INTERRUPT
      
      Old bsd_ring_get/put_irq call ring_get_irq and ring_get_irq.
      ring_get_irq and ring_put_irq only call ironlake_enable/disable_irq.
      So comes the irq miss on g4x.
      
      To fix this, as other rings' code do, conditionally call different
      functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
      and use different interrupt flags in bsd_ring_get/put_irq.
      Signed-off-by: default avatarFeng, Boqun <boqun.feng@intel.com>
      Reviewed-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
      5bfa1063
    • Randy Dunlap's avatar
      drm: fix nouveau_acpi build · fb0b7606
      Randy Dunlap authored
      Fix build errors when CONFIG_ACPI is enabled but MXM_WMI is not enabled
      by selecting both MXM_WMI and ACPI_WMI (the latter just for kconfig
      dependencies):
      
      nouveau_acpi.c:(.text+0x2400c8): undefined reference to `mxm_wmi_call_mxmx'
      nouveau_acpi.c:(.text+0x2400cf): undefined reference to `mxm_wmi_call_mxds'
      nouveau_acpi.c:(.text+0x2400fe): undefined reference to `mxm_wmi_call_mxmx'
      nouveau_acpi.c:(.text+0x2402ba): undefined reference to `mxm_wmi_supported
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      fb0b7606