Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/fence: add drm_crtc_create_fence()

Instead of dealing with crtc details inside drm_atomic.c we should
just export a function that creates a new crtc fence for us and
use that.

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1481046437-18778-1-git-send-email-gustavo@padovan.org

+19 -17
+1 -15
drivers/gpu/drm/drm_atomic.c
··· 1864 1864 * helpers and for the DRM event handling for existing userspace. 1865 1865 */ 1866 1866 1867 - static struct dma_fence *get_crtc_fence(struct drm_crtc *crtc) 1868 - { 1869 - struct dma_fence *fence; 1870 - 1871 - fence = kzalloc(sizeof(*fence), GFP_KERNEL); 1872 - if (!fence) 1873 - return NULL; 1874 - 1875 - dma_fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock, 1876 - crtc->fence_context, ++crtc->fence_seqno); 1877 - 1878 - return fence; 1879 - } 1880 - 1881 1867 struct drm_out_fence_state { 1882 1868 s64 __user *out_fence_ptr; 1883 1869 struct sync_file *sync_file; ··· 1945 1959 f[*num_fences].out_fence_ptr = fence_ptr; 1946 1960 *fence_state = f; 1947 1961 1948 - fence = get_crtc_fence(crtc); 1962 + fence = drm_crtc_create_fence(crtc); 1949 1963 if (!fence) 1950 1964 return -ENOMEM; 1951 1965
+17 -1
drivers/gpu/drm/drm_crtc.c
··· 152 152 #endif 153 153 } 154 154 155 + static const struct dma_fence_ops drm_crtc_fence_ops; 156 + 155 157 static struct drm_crtc *fence_to_crtc(struct dma_fence *fence) 156 158 { 157 159 BUG_ON(fence->ops != &drm_crtc_fence_ops); ··· 179 177 return true; 180 178 } 181 179 182 - const struct dma_fence_ops drm_crtc_fence_ops = { 180 + static const struct dma_fence_ops drm_crtc_fence_ops = { 183 181 .get_driver_name = drm_crtc_fence_get_driver_name, 184 182 .get_timeline_name = drm_crtc_fence_get_timeline_name, 185 183 .enable_signaling = drm_crtc_fence_enable_signaling, 186 184 .wait = dma_fence_default_wait, 187 185 }; 186 + 187 + struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc) 188 + { 189 + struct dma_fence *fence; 190 + 191 + fence = kzalloc(sizeof(*fence), GFP_KERNEL); 192 + if (!fence) 193 + return NULL; 194 + 195 + dma_fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock, 196 + crtc->fence_context, ++crtc->fence_seqno); 197 + 198 + return fence; 199 + } 188 200 189 201 /** 190 202 * drm_crtc_init_with_planes - Initialise a new CRTC object with
+1 -1
drivers/gpu/drm/drm_crtc_internal.h
··· 43 43 int drm_crtc_register_all(struct drm_device *dev); 44 44 void drm_crtc_unregister_all(struct drm_device *dev); 45 45 46 - extern const struct dma_fence_ops drm_crtc_fence_ops; 46 + struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc); 47 47 48 48 /* IOCTLs */ 49 49 int drm_mode_getcrtc(struct drm_device *dev,