From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: Re: [PATCH] drm/nouveau/pm: fix oops on get/set_perflvl Date: Tue, 29 May 2012 21:15:29 +1000 Message-ID: <20120529111529.GA1773@nisroch.redhat.com> References: <20120527200041.GE2907@joi.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20120527200041.GE2907-OI9uyE9O0yo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Marcin Slusarz Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org On Sun, May 27, 2012 at 10:00:41PM +0200, Marcin Slusarz wrote: > Regression from "drm/nouveau: very scary looking cleanup commit" Thanks, pushed. > > Signed-off-by: Marcin Slusarz > --- > drivers/gpu/drm/nouveau/nouveau_pm.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c > index 9dd34fe..5539482 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_pm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c > @@ -306,7 +306,8 @@ nouveau_pm_get_perflvl_info(struct device *d, > static ssize_t > nouveau_pm_get_perflvl(struct device *d, struct device_attribute *a, char *buf) > { > - struct nouveau_device *ndev = pci_get_drvdata(to_pci_dev(d)); > + struct drm_device *dev = pci_get_drvdata(to_pci_dev(d)); > + struct nouveau_device *ndev = nouveau_device(dev); > struct nouveau_pm_engine *pm = &ndev->subsys.pm; > struct nouveau_pm_level cur; > int len = PAGE_SIZE, ret; > @@ -327,7 +328,8 @@ static ssize_t > nouveau_pm_set_perflvl(struct device *d, struct device_attribute *a, > const char *buf, size_t count) > { > - struct nouveau_device *ndev = pci_get_drvdata(to_pci_dev(d)); > + struct drm_device *dev = pci_get_drvdata(to_pci_dev(d)); > + struct nouveau_device *ndev = nouveau_device(dev); > int ret; > > ret = nouveau_pm_profile_set(ndev, buf); > -- > 1.7.8.6 >