1. 22 May, 2011 7 commits
  2. 20 May, 2011 19 commits
  3. 18 May, 2011 2 commits
  4. 17 May, 2011 3 commits
  5. 16 May, 2011 9 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
    • Dave Airlie's avatar
      Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-core-next · 46f2b607
      Dave Airlie authored
      * 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: (55 commits)
        drm/nouveau: make cursor_set implementation consistent with other drivers
        drm/nva3/clk: better pll calculation when no fractional fb div available
        drm/nouveau/pm: translate ramcfg strap through ram restrict table
        drm/nva3/pm: allow use of divisor 16
        drm/nvc0/pm: parse clock for pll 0x0a (0x137020) from perf table
        drm/nvc0/pm: correct core/mem/shader perflvl parsing
        drm/nouveau/pm: remove memtiming support check when assigning to perflvl
        drm/nva3: support for memory timing map table
        drm/nouveau: Associate memtimings with performance levels on cards <= nv98
        drm/nva3/pm: initial pass at set_clock() hook
        drm/nvc0/gr: calculate some more of our magic numbers
        drm/nv50: respect LVDS link count from EDID on SPWG panels
        drm/nouveau: recognise DCB connector type 0x41 as LVDS
        drm/nouveau: fix uninitialised variable warning
        drm/nouveau: Fix a crash at card takedown for NV40 and older cards
        drm/nouveau: Free nv04 instmem ramin heap at card takedown
        drm/nva3: somewhat improve clock reporting
        drm/nouveau: pull refclk from vbios on limits 0x40 boards
        drm/nv40/gr: oops, fix random bits getting set in engine obj
        drm/nv50: improve nv50_pm_get_clock()
        ...
      46f2b607
    • Marcin Slusarz's avatar
      drm/nouveau: make cursor_set implementation consistent with other drivers · b4fa9d0f
      Marcin Slusarz authored
      When xorg state tracker wants to hide the cursor it calls set_cursor
      with NULL buffer_handle and size=0x0, but nouveau refuses to hide it
      because size is not 64x64... which is a bit odd. Both radeon and intel
      check buffer_handle before validating size of cursor, so make nouveau
      implementation consistent with them.
      Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      b4fa9d0f
    • Ben Skeggs's avatar
      drm/nva3/clk: better pll calculation when no fractional fb div available · 52eba8dd
      Ben Skeggs authored
      The core/mem/shader clocks don't support the fractional feedback divider,
      causing our calculated clocks to be off by quite a lot in some cases.  To
      solve this we will switch to a search-based algorithm when fN is NULL.
      
      For my NVA8 at PL3, this actually generates identical cooefficients to
      the binary driver.  Hopefully that's a good sign, and that does not
      break VPLL calculation for someone..
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      52eba8dd
    • Ben Skeggs's avatar
      drm/nouveau/pm: translate ramcfg strap through ram restrict table · 96d1fcf8
      Ben Skeggs authored
      Hopefully this is how we're supposed to correctly handle when the RAMCFG
      strap is above the number of entries in timing-related tables.
      
      It's rather difficult to confirm without finding a configuration where
      the ram restrict table doesn't map 8-15 back onto 0-7 anyway.  There's
      not a single vbios in the repo which is configured differently..
      
      In any case, this is probably still better than potentially reading
      outside of the bounds of various tables..
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      96d1fcf8
    • Ben Skeggs's avatar
      drm/nva3/pm: allow use of divisor 16 · bfb61f43
      Ben Skeggs authored
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      bfb61f43
    • Ben Skeggs's avatar