lkml.org 
[lkml]   [2012]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 195/262] drm/nvc0/copy: check PUNITS to determine which copy engines are disabled
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Ben Skeggs <bskeggs@redhat.com>

    commit 14f0458a41e033dee31ba605137419385c03fc78 upstream.

    On some Fermi chipsets (NVCE particularly) PCOPY1 doesn't exist. And if
    what I've seen on Kepler is true of Fermi too, chipsets of the same type
    can have different PCOPY units available.

    This should fix a v3.5 regression reported by a number of people effecting
    suspend/resume on NVC8/NVCE chipsets.

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/nouveau_state.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_state.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
    @@ -737,9 +737,11 @@ nouveau_card_init(struct drm_device *dev
    }
    break;
    case NV_C0:
    - nvc0_copy_create(dev, 1);
    + if (!(nv_rd32(dev, 0x022500) & 0x00000200))
    + nvc0_copy_create(dev, 1);
    case NV_D0:
    - nvc0_copy_create(dev, 0);
    + if (!(nv_rd32(dev, 0x022500) & 0x00000100))
    + nvc0_copy_create(dev, 0);
    break;
    default:
    break;



    \
     
     \ /
      Last update: 2012-09-28 22:01    [W:4.039 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site