diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-05-30 21:11:28 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 01:58:15 -0400 |
commit | 3f0a68d8f8ba9d6c0cd9df948fbba90944c3da62 (patch) | |
tree | 8324d573e0ec5fc55e359e3d725bf8b9c7135bce /drivers/gpu/drm/nouveau/nouveau_state.c | |
parent | 1562ffde94fc232e5b7d6d32f43abb3e25468dac (diff) |
drm/nouveau: allocate structure to store per-client data
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index a0e17340e145..9aa96b9375ae 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
@@ -764,6 +764,20 @@ static void nouveau_card_takedown(struct drm_device *dev) | |||
764 | vga_client_register(dev->pdev, NULL, NULL, NULL); | 764 | vga_client_register(dev->pdev, NULL, NULL, NULL); |
765 | } | 765 | } |
766 | 766 | ||
767 | int | ||
768 | nouveau_open(struct drm_device *dev, struct drm_file *file_priv) | ||
769 | { | ||
770 | struct nouveau_fpriv *fpriv; | ||
771 | |||
772 | fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL); | ||
773 | if (unlikely(!fpriv)) | ||
774 | return -ENOMEM; | ||
775 | |||
776 | spin_lock_init(&fpriv->lock); | ||
777 | file_priv->driver_priv = fpriv; | ||
778 | return 0; | ||
779 | } | ||
780 | |||
767 | /* here a client dies, release the stuff that was allocated for its | 781 | /* here a client dies, release the stuff that was allocated for its |
768 | * file_priv */ | 782 | * file_priv */ |
769 | void nouveau_preclose(struct drm_device *dev, struct drm_file *file_priv) | 783 | void nouveau_preclose(struct drm_device *dev, struct drm_file *file_priv) |
@@ -771,6 +785,13 @@ void nouveau_preclose(struct drm_device *dev, struct drm_file *file_priv) | |||
771 | nouveau_channel_cleanup(dev, file_priv); | 785 | nouveau_channel_cleanup(dev, file_priv); |
772 | } | 786 | } |
773 | 787 | ||
788 | void | ||
789 | nouveau_postclose(struct drm_device *dev, struct drm_file *file_priv) | ||
790 | { | ||
791 | struct nouveau_fpriv *fpriv = nouveau_fpriv(file_priv); | ||
792 | kfree(fpriv); | ||
793 | } | ||
794 | |||
774 | /* first module load, setup the mmio/fb mapping */ | 795 | /* first module load, setup the mmio/fb mapping */ |
775 | /* KMS: we need mmio at load time, not when the first drm client opens. */ | 796 | /* KMS: we need mmio at load time, not when the first drm client opens. */ |
776 | int nouveau_firstopen(struct drm_device *dev) | 797 | int nouveau_firstopen(struct drm_device *dev) |