From mboxrd@z Thu Jan 1 00:00:00 1970 From: "j.glisse" Subject: Re: [PATCH 04/10] drm/radeon: replace vmram_mutex with mclk_lock v2 Date: Thu, 24 May 2012 11:57:56 -0400 Message-ID: <20120524155755.GE3467@gmail.com> References: <1337845754-3718-1-git-send-email-deathsimple@vodafone.de> <1337845754-3718-4-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id D1DCC9F0E9 for ; Thu, 24 May 2012 08:58:13 -0700 (PDT) Received: by mail-vb0-f49.google.com with SMTP id fo1so7087640vbb.36 for ; Thu, 24 May 2012 08:58:13 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1337845754-3718-4-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Thu, May 24, 2012 at 09:49:08AM +0200, Christian K=F6nig wrote: > It is a rw_semaphore now and only write locked > while changing the clock. Also the lock is renamed > to better reflect what it is protecting. > = > v2: Keep the ttm_vm_ops on IGPs > = > Signed-off-by: Christian K=F6nig Reviewed-by: Jerome Glisse > --- > drivers/gpu/drm/radeon/radeon.h | 3 ++- > drivers/gpu/drm/radeon/radeon_device.c | 2 +- > drivers/gpu/drm/radeon/radeon_object.c | 8 ++++---- > drivers/gpu/drm/radeon/radeon_pm.c | 4 ++-- > drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++-- > 5 files changed, 11 insertions(+), 10 deletions(-) > = > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/rad= eon.h > index aebaf28..3e83480 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -1055,6 +1055,8 @@ struct radeon_power_state { > = > struct radeon_pm { > struct mutex mutex; > + /* write locked while reprogramming mclk */ > + struct rw_semaphore mclk_lock; > u32 active_crtcs; > int active_crtc_count; > int req_vblank; > @@ -1551,7 +1553,6 @@ struct radeon_device { > struct work_struct audio_work; > int num_crtc; /* number of crtcs */ > struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */ > - struct mutex vram_mutex; > bool audio_enabled; > struct r600_audio audio_status; /* audio stuff */ > struct notifier_block acpi_nb; > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/rad= eon/radeon_device.c > index 066c98b..7667184 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -735,7 +735,7 @@ int radeon_device_init(struct radeon_device *rdev, > spin_lock_init(&rdev->ih.lock); > mutex_init(&rdev->gem.mutex); > mutex_init(&rdev->pm.mutex); > - mutex_init(&rdev->vram_mutex); > + init_rwsem(&rdev->pm.mclk_lock); > init_waitqueue_head(&rdev->irq.vblank_queue); > init_waitqueue_head(&rdev->irq.idle_queue); > r =3D radeon_gem_init(rdev); > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/rad= eon/radeon_object.c > index 830f1a7..6ecb200 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -154,11 +154,11 @@ retry: > INIT_LIST_HEAD(&bo->va); > radeon_ttm_placement_from_domain(bo, domain); > /* Kernel allocation are uninterruptible */ > - mutex_lock(&rdev->vram_mutex); > + down_read(&rdev->pm.mclk_lock); > r =3D ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type, > &bo->placement, page_align, 0, !kernel, NULL, > acc_size, sg, &radeon_ttm_bo_destroy); > - mutex_unlock(&rdev->vram_mutex); > + up_read(&rdev->pm.mclk_lock); > if (unlikely(r !=3D 0)) { > if (r !=3D -ERESTARTSYS) { > if (domain =3D=3D RADEON_GEM_DOMAIN_VRAM) { > @@ -219,9 +219,9 @@ void radeon_bo_unref(struct radeon_bo **bo) > return; > rdev =3D (*bo)->rdev; > tbo =3D &((*bo)->tbo); > - mutex_lock(&rdev->vram_mutex); > + down_read(&rdev->pm.mclk_lock); > ttm_bo_unref(&tbo); > - mutex_unlock(&rdev->vram_mutex); > + up_read(&rdev->pm.mclk_lock); > if (tbo =3D=3D NULL) > *bo =3D NULL; > } > diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/= radeon_pm.c > index 0882554..d13b6ae 100644 > --- a/drivers/gpu/drm/radeon/radeon_pm.c > +++ b/drivers/gpu/drm/radeon/radeon_pm.c > @@ -251,7 +251,7 @@ static void radeon_pm_set_clocks(struct radeon_device= *rdev) > return; > = > mutex_lock(&rdev->ddev->struct_mutex); > - mutex_lock(&rdev->vram_mutex); > + down_write(&rdev->pm.mclk_lock); > mutex_lock(&rdev->ring_lock); > = > /* gui idle int has issues on older chips it seems */ > @@ -303,7 +303,7 @@ static void radeon_pm_set_clocks(struct radeon_device= *rdev) > rdev->pm.dynpm_planned_action =3D DYNPM_ACTION_NONE; > = > mutex_unlock(&rdev->ring_lock); > - mutex_unlock(&rdev->vram_mutex); > + up_write(&rdev->pm.mclk_lock); > mutex_unlock(&rdev->ddev->struct_mutex); > } > = > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon= /radeon_ttm.c > index c43035c..0881131 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -797,9 +797,9 @@ static int radeon_ttm_fault(struct vm_area_struct *vm= a, struct vm_fault *vmf) > return VM_FAULT_NOPAGE; > } > rdev =3D radeon_get_rdev(bo->bdev); > - mutex_lock(&rdev->vram_mutex); > + down_read(&rdev->pm.mclk_lock); > r =3D ttm_vm_ops->fault(vma, vmf); > - mutex_unlock(&rdev->vram_mutex); > + up_read(&rdev->pm.mclk_lock); > return r; > } > = > -- = > 1.7.9.5 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel