dri-devel November 2015

dri-devel@lists.freedesktop.org

171 participants
1176 discussions

[patch] drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
by Dan Carpenter 04 Nov '15

04 Nov '15

We recently changed the locking in this function and now there is a missing unlock on error. Also there are some other resources that we should probably release as well... Fixes: f48b2659f521 ('drm/amdgpu: fix the broken vm->mutex V2') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- I'm not terribly familiar with this code. Please review this one a bit carefully. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 27ef528..dfc4d02 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -876,8 +876,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) struct amdgpu_job *job; struct amdgpu_ring * ring = parser->ibs->ring; job = kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL); - if (!job) - return -ENOMEM; + if (!job) { + r = -ENOMEM; + goto out; + } job->base.sched = &ring->sched; job->base.s_entity = &parser->ctx->rings[ring->idx].entity; job->adev = parser->adev;

3 2

[PATCH] OCL20: Add svm support.
by Yang Rong 04 Nov '15

04 Nov '15

Enable CL_DEVICE_SVM_COARSE_GRAIN_BUFFER svm support, use userptr and softpin to implement it. Use userptr to share the page between cpu and gpu, and softpin to unify the cpu and gpu's address. Now it works on i386 system. x86_64 depends on backend support. This patch base on DRM library and DRM kernel driver's softpin patch: http://lists.freedesktop.org/archives/intel-gfx/2015-September/075446.html. Signed-off-by: Yang Rong <rong.r.yang(a)intel.com> --- src/cl_api.c | 87 ++++++++++++++++++++++++++++++++++ src/cl_context.c | 13 +++++ src/cl_context.h | 4 ++ src/cl_device_id.c | 1 + src/cl_device_id.h | 3 +- src/cl_driver.h | 3 ++ src/cl_driver_defs.c | 1 + src/cl_enqueue.c | 6 ++- src/cl_gen8_device.h | 4 +- src/cl_gen9_device.h | 4 +- src/cl_gt_device.h | 1 + src/cl_kernel.c | 36 ++++++++++++++ src/cl_kernel.h | 8 +++- src/cl_mem.c | 121 +++++++++++++++++++++++++++++++++++++++++++++-- src/cl_mem.h | 13 ++++- src/intel/intel_driver.c | 5 +- 16 files changed, 295 insertions(+), 15 deletions(-) diff --git a/src/cl_api.c b/src/cl_api.c index a18bc99..134870d 100644 --- a/src/cl_api.c +++ b/src/cl_api.c @@ -575,6 +575,80 @@ error: return mem; } +void * +clSVMAlloc (cl_context context, + cl_svm_mem_flags flags, + size_t size, + unsigned int alignment) +{ + cl_int err = CL_SUCCESS; + CHECK_CONTEXT (context); + return cl_mem_svm_allocate(context, flags, size, alignment); +error: + return NULL; +} + +void + clSVMFree (cl_context context, void* svm_pointer) +{ + cl_int err = CL_SUCCESS; + CHECK_CONTEXT (context); + return cl_mem_svm_delete(context, svm_pointer); +error: + return; +} + +cl_int +clEnqueueSVMMap (cl_command_queue command_queue, + cl_bool blocking_map, + cl_map_flags map_flags, + void *svm_ptr, + size_t size, + cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) +{ + cl_int err = CL_SUCCESS; + cl_mem buffer; + + CHECK_QUEUE(command_queue); + buffer = cl_context_get_svm_from_ptr(command_queue->ctx, svm_ptr); + if(buffer == NULL) { + err = CL_INVALID_VALUE; + goto error; + } + + clEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, 0, size, + num_events_in_wait_list, event_wait_list, event, &err); +error: + return err; +} + +cl_int +clEnqueueSVMUnmap (cl_command_queue command_queue, + void *svm_ptr, + cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) +{ + cl_int err = CL_SUCCESS; + cl_mem buffer; + + CHECK_QUEUE(command_queue); + buffer = cl_context_get_svm_from_ptr(command_queue->ctx, svm_ptr); + if(buffer == NULL) { + err = CL_INVALID_VALUE; + goto error; + } + + err = clEnqueueUnmapMemObject(command_queue, buffer, svm_ptr, + num_events_in_wait_list, event_wait_list, event); + +error: + return err; +} + + cl_mem clCreateImage2D(cl_context context, cl_mem_flags flags, @@ -1248,6 +1322,19 @@ error: return err; } +cl_int +clSetKernelArgSVMPointer (cl_kernel kernel, + cl_uint arg_index, + const void *arg_value) +{ + cl_int err = CL_SUCCESS; + CHECK_KERNEL(kernel); + + err = cl_kernel_set_arg_svm_pointer(kernel, arg_index, arg_value); +error: + return err; +} + cl_int clGetKernelArgInfo(cl_kernel kernel, cl_uint arg_index, cl_kernel_arg_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) { diff --git a/src/cl_context.c b/src/cl_context.c index c45e0aa..3fcdb63 100644 --- a/src/cl_context.c +++ b/src/cl_context.c @@ -328,3 +328,16 @@ unlock: pthread_mutex_unlock(&ctx->program_lock); return cl_kernel_dup(ker); } + +cl_mem +cl_context_get_svm_from_ptr(cl_context ctx, void * p) +{ + cl_mem buf = ctx->svm_buffers; + while(buf) { + assert(buf->host_ptr && buf->is_svm); + if(buf->host_ptr == p) + return buf; + buf = buf->next; + } + return NULL; +} diff --git a/src/cl_context.h b/src/cl_context.h index ef94823..365ec32 100644 --- a/src/cl_context.h +++ b/src/cl_context.h @@ -106,11 +106,13 @@ struct _cl_context { cl_command_queue queues; /* All command queues currently allocated */ cl_program programs; /* All programs currently allocated */ cl_mem buffers; /* All memory object currently allocated */ + cl_mem svm_buffers; /* All svm object currently allocated */ cl_sampler samplers; /* All sampler object currently allocated */ cl_event events; /* All event object currently allocated */ pthread_mutex_t queue_lock; /* To allocate and deallocate queues */ pthread_mutex_t program_lock; /* To allocate and deallocate programs */ pthread_mutex_t buffer_lock; /* To allocate and deallocate buffers */ + pthread_mutex_t svm_lock; /* To allocate and deallocate SVM */ pthread_mutex_t sampler_lock; /* To allocate and deallocate samplers */ pthread_mutex_t event_lock; /* To allocate and deallocate events */ cl_program internal_prgs[CL_INTERNAL_KERNEL_MAX]; @@ -168,5 +170,7 @@ extern cl_buffer_mgr cl_context_get_bufmgr(cl_context ctx); extern cl_kernel cl_context_get_static_kernel_from_bin(cl_context ctx, cl_int index, const char * str_kernel, size_t size, const char * str_option); +/* Get the SVM from pointer, return NULL if pointer is not from SVM */ +extern cl_mem cl_context_get_svm_from_ptr(cl_context ctx, void *p); #endif /* __CL_CONTEXT_H__ */ diff --git a/src/cl_device_id.c b/src/cl_device_id.c index deb2fad..b518d48 100644 --- a/src/cl_device_id.c +++ b/src/cl_device_id.c @@ -836,6 +836,7 @@ cl_get_device_info(cl_device_id device, DECL_FIELD(REFERENCE_COUNT, device_reference_count) DECL_FIELD(IMAGE_PITCH_ALIGNMENT, image_pitch_alignment) DECL_FIELD(IMAGE_BASE_ADDRESS_ALIGNMENT, image_base_address_alignment) + DECL_FIELD(SVM_CAPABILITIES, svm_capabilities) case CL_DRIVER_VERSION: if (param_value_size_ret) { diff --git a/src/cl_device_id.h b/src/cl_device_id.h index 4a923ef..6341362 100644 --- a/src/cl_device_id.h +++ b/src/cl_device_id.h @@ -51,7 +51,8 @@ struct _cl_device_id { cl_uint native_vector_width_half; cl_uint max_clock_frequency; cl_uint address_bits; - cl_ulong max_mem_alloc_size; + size_t max_mem_alloc_size; + cl_device_svm_capabilities svm_capabilities; cl_bool image_support; cl_uint max_read_image_args; cl_uint max_write_image_args; diff --git a/src/cl_driver.h b/src/cl_driver.h index 4ffca09..639822b 100644 --- a/src/cl_driver.h +++ b/src/cl_driver.h @@ -299,6 +299,9 @@ extern cl_buffer_alloc_cb *cl_buffer_alloc; typedef cl_buffer (cl_buffer_alloc_userptr_cb)(cl_buffer_mgr, const char*, void *, size_t, unsigned long); extern cl_buffer_alloc_userptr_cb *cl_buffer_alloc_userptr; +typedef cl_buffer (cl_buffer_set_softpin_offset_cb)(cl_buffer, uint64_t); +extern cl_buffer_set_softpin_offset_cb *cl_buffer_set_softpin_offset; + /* Set a buffer's tiling mode */ typedef cl_buffer (cl_buffer_set_tiling_cb)(cl_buffer, int tiling, size_t stride); extern cl_buffer_set_tiling_cb *cl_buffer_set_tiling; diff --git a/src/cl_driver_defs.c b/src/cl_driver_defs.c index b77acdc..333028c 100644 --- a/src/cl_driver_defs.c +++ b/src/cl_driver_defs.c @@ -32,6 +32,7 @@ LOCAL cl_driver_update_device_info_cb *cl_driver_update_device_info = NULL; /* Buffer */ LOCAL cl_buffer_alloc_cb *cl_buffer_alloc = NULL; LOCAL cl_buffer_alloc_userptr_cb *cl_buffer_alloc_userptr = NULL; +LOCAL cl_buffer_set_softpin_offset_cb *cl_buffer_set_softpin_offset = NULL; LOCAL cl_buffer_set_tiling_cb *cl_buffer_set_tiling = NULL; LOCAL cl_buffer_alloc_from_texture_cb *cl_buffer_alloc_from_texture = NULL; LOCAL cl_buffer_release_from_texture_cb *cl_buffer_release_from_texture = NULL; diff --git a/src/cl_enqueue.c b/src/cl_enqueue.c index cec368c..371b2d4 100644 --- a/src/cl_enqueue.c +++ b/src/cl_enqueue.c @@ -261,7 +261,8 @@ cl_int cl_enqueue_map_buffer(enqueue_data *data) cl_int err = CL_SUCCESS; cl_mem mem = data->mem_obj; assert(mem->type == CL_MEM_BUFFER_TYPE || - mem->type == CL_MEM_SUBBUFFER_TYPE); + mem->type == CL_MEM_SUBBUFFER_TYPE || + mem->type == CL_MEM_SVM_TYPE); struct _cl_mem_buffer* buffer = (struct _cl_mem_buffer*)mem; if (mem->is_userptr) @@ -362,7 +363,8 @@ cl_int cl_enqueue_unmap_mem_object(enqueue_data *data) if (memobj->flags & CL_MEM_USE_HOST_PTR) { if(memobj->type == CL_MEM_BUFFER_TYPE || - memobj->type == CL_MEM_SUBBUFFER_TYPE) { + memobj->type == CL_MEM_SUBBUFFER_TYPE || + memobj->type == CL_MEM_SVM_TYPE) { assert(mapped_ptr >= memobj->host_ptr && mapped_ptr + mapped_size <= memobj->host_ptr + memobj->size); /* Sync the data. */ diff --git a/src/cl_gen8_device.h b/src/cl_gen8_device.h index 08fde48..ab845d1 100644 --- a/src/cl_gen8_device.h +++ b/src/cl_gen8_device.h @@ -24,7 +24,7 @@ .local_mem_type = CL_GLOBAL, .local_mem_size = 64 << 10, .scratch_mem_size = 2 << 20, -.max_mem_alloc_size = 2 * 1024 * 1024 * 1024ul, -.global_mem_size = 4 * 1024 * 1024 * 1024ul, +.max_mem_alloc_size = 2 * 1024 * 1024 * 1024ull, +.global_mem_size = 4 * 1024 * 1024 * 1024ull, #include "cl_gt_device.h" diff --git a/src/cl_gen9_device.h b/src/cl_gen9_device.h index f50f9c7..03f4dad 100644 --- a/src/cl_gen9_device.h +++ b/src/cl_gen9_device.h @@ -24,8 +24,8 @@ .local_mem_type = CL_GLOBAL, .local_mem_size = 64 << 10, .scratch_mem_size = 2 << 20, -.max_mem_alloc_size = 4 * 1024 * 1024 * 1024ul, -.global_mem_size = 4 * 1024 * 1024 * 1024ul, +.max_mem_alloc_size = 2 * 1024 * 1024 * 1024ull, +.global_mem_size = 4 * 1024 * 1024 * 1024ull, #include "cl_gt_device.h" diff --git a/src/cl_gt_device.h b/src/cl_gt_device.h index e61ff61..cf48b6d 100644 --- a/src/cl_gt_device.h +++ b/src/cl_gt_device.h @@ -41,6 +41,7 @@ .native_vector_width_half = 8, .preferred_wg_sz_mul = 16, .address_bits = 32, +.svm_capabilities = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER, .image_support = CL_TRUE, .max_read_image_args = BTI_MAX_READ_IMAGE_ARGS, .max_write_image_args = BTI_MAX_WRITE_IMAGE_ARGS, diff --git a/src/cl_kernel.c b/src/cl_kernel.c index 58a1224..723eac3 100644 --- a/src/cl_kernel.c +++ b/src/cl_kernel.c @@ -213,11 +213,47 @@ cl_kernel_set_arg(cl_kernel k, cl_uint index, size_t sz, const void *value) cl_mem_delete(k->args[index].mem); k->args[index].mem = mem; k->args[index].is_set = 1; + k->args[index].is_svm = mem->is_svm; + if(mem->is_svm) + k->args[index].ptr = mem->host_ptr; k->args[index].local_sz = 0; k->args[index].bti = interp_kernel_get_arg_bti(k->opaque, index); return CL_SUCCESS; } + +LOCAL cl_int +cl_kernel_set_arg_svm_pointer(cl_kernel k, cl_uint index, const void *value) +{ + enum gbe_arg_type arg_type; /* kind of argument */ + size_t arg_sz; /* size of the argument */ + cl_context ctx = k->program->ctx; + cl_mem mem= cl_context_get_svm_from_ptr(ctx, value); + + if (UNLIKELY(index >= k->arg_n)) + return CL_INVALID_ARG_INDEX; + arg_type = interp_kernel_get_arg_type(k->opaque, index); + arg_sz = interp_kernel_get_arg_size(k->opaque, index); + + if(arg_type != GBE_ARG_GLOBAL_PTR && arg_type != GBE_ARG_CONSTANT_PTR ) + return CL_INVALID_ARG_VALUE; + + if(mem == NULL) + return CL_INVALID_ARG_VALUE; + + cl_mem_add_ref(mem); + if (k->args[index].mem) + cl_mem_delete(k->args[index].mem); + + k->args[index].ptr = value; + k->args[index].mem = mem; + k->args[index].is_set = 1; + k->args[index].is_svm = 1; + k->args[index].local_sz = 0; + k->args[index].bti = interp_kernel_get_arg_bti(k->opaque, index); + return 0; +} + LOCAL int cl_get_kernel_arg_info(cl_kernel k, cl_uint arg_index, cl_kernel_arg_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) diff --git a/src/cl_kernel.h b/src/cl_kernel.h index 140bbb1..5b3294b 100644 --- a/src/cl_kernel.h +++ b/src/cl_kernel.h @@ -38,8 +38,10 @@ typedef struct cl_argument { cl_mem mem; /* For image and regular buffers */ cl_sampler sampler; /* For sampler. */ unsigned char bti; - uint32_t local_sz:31; /* For __local size specification */ + void *ptr; /* SVM ptr value. */ + uint32_t local_sz:30; /* For __local size specification */ uint32_t is_set:1; /* All args must be set before NDRange */ + uint32_t is_svm:1; /* Indicate this argument is SVMPointer */ } cl_argument; /* One OCL function */ @@ -98,6 +100,10 @@ extern int cl_kernel_set_arg(cl_kernel, uint32_t arg_index, size_t arg_size, const void *arg_value); +extern int cl_kernel_set_arg_svm_pointer(cl_kernel, + uint32_t arg_index, + const void *arg_value); + /* Get the argument information */ extern int cl_get_kernel_arg_info(cl_kernel k, cl_uint arg_index, diff --git a/src/cl_mem.c b/src/cl_mem.c index be64abe..0d4d328 100644 --- a/src/cl_mem.c +++ b/src/cl_mem.c @@ -83,6 +83,7 @@ cl_get_mem_object_info(cl_mem mem, FIELD_SIZE(MEM_CONTEXT, cl_context); FIELD_SIZE(MEM_ASSOCIATED_MEMOBJECT, cl_mem); FIELD_SIZE(MEM_OFFSET, size_t); + FIELD_SIZE(MEM_USES_SVM_POINTER, cl_bool); default: return CL_INVALID_VALUE; } @@ -131,6 +132,8 @@ cl_get_mem_object_info(cl_mem mem, *((size_t *)param_value) = buf->sub_offset; } break; + case CL_MEM_USES_SVM_POINTER: + *((cl_uint *)param_value) = mem->is_svm; } return CL_SUCCESS; @@ -291,6 +294,9 @@ cl_mem_allocate(enum cl_mem_type type, if (type == CL_MEM_BUFFER_TYPE) { if (flags & CL_MEM_USE_HOST_PTR) { assert(host_ptr != NULL); + cl_mem svm_mem = NULL; + if((svm_mem = cl_context_get_svm_from_ptr(ctx, host_ptr)) != NULL) + mem->is_svm = 1; /* userptr not support tiling */ if (!is_tiled) { if (ALIGN((unsigned long)host_ptr, cacheline_size) == (unsigned long)host_ptr) { @@ -298,7 +304,12 @@ cl_mem_allocate(enum cl_mem_type type, mem->offset = host_ptr - aligned_host_ptr; mem->is_userptr = 1; size_t aligned_sz = ALIGN((mem->offset + sz), page_size); - mem->bo = cl_buffer_alloc_userptr(bufmgr, "CL userptr memory object", aligned_host_ptr, aligned_sz, 0); + if(svm_mem != NULL) { + mem->bo = svm_mem->bo; + cl_mem_add_ref(svm_mem); + } else + mem->bo = cl_buffer_alloc_userptr(bufmgr, "CL userptr memory object", aligned_host_ptr, aligned_sz, 0); + bufCreated = 1; } } @@ -608,6 +619,91 @@ void cl_mem_replace_buffer(cl_mem buffer, cl_buffer new_bo) } } +void* cl_mem_svm_allocate(cl_context ctx, cl_svm_mem_flags flags, + size_t size, unsigned int alignment) +{ + cl_int err = CL_SUCCESS; + size_t max_mem_size; + + if(UNLIKELY(alignment & (alignment - 1))) + return NULL; + + if ((err = cl_get_device_info(ctx->device, + CL_DEVICE_MAX_MEM_ALLOC_SIZE, + sizeof(max_mem_size), + &max_mem_size, + NULL)) != CL_SUCCESS) { + return NULL; + } + + if(UNLIKELY(size == 0 || size > max_mem_size)) { + return NULL; + } + + if (flags & (CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_SVM_ATOMICS)) { + return NULL; + } + if (flags && ((flags & (CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_SVM_FINE_GRAIN_BUFFER)) + || ((flags & CL_MEM_WRITE_ONLY) && (flags & CL_MEM_READ_ONLY)) + || ((flags & CL_MEM_WRITE_ONLY) && (flags & CL_MEM_READ_WRITE)) + || ((flags & CL_MEM_READ_ONLY) && (flags & CL_MEM_READ_WRITE)))) { + return NULL; + } + +#ifdef HAS_USERPTR + cl_buffer_mgr bufmgr = NULL; + void * ptr = NULL; + cl_mem mem; + _cl_mem_svm* svm; + if(UNLIKELY((svm = CALLOC(_cl_mem_svm)) == NULL)) + return NULL; + mem = &svm->base; + + mem->type = CL_MEM_SVM_TYPE; + SET_ICD(mem->dispatch) + mem->ref_n = 1; + mem->magic = CL_MAGIC_MEM_HEADER; + mem->flags = flags | CL_MEM_USE_HOST_PTR; + mem->is_userptr = 0; + mem->is_svm = 0; + mem->offset = 0; + + bufmgr = cl_context_get_bufmgr(ctx); + assert(bufmgr); + + int page_size = getpagesize(); + const size_t alignedSZ = ALIGN(size, page_size); + if(alignment == 0) + alignment = page_size; + else + alignment = ALIGN(alignment, page_size); + ptr = cl_aligned_malloc(alignedSZ, alignment); + if(ptr == NULL) return NULL; + + mem->host_ptr = ptr; + mem->is_svm = 1; + mem->is_userptr = 1; + mem->bo = cl_buffer_alloc_userptr(bufmgr, "CL SVM memory object", ptr, alignedSZ, 0); + mem->size = size; + cl_buffer_set_softpin_offset(mem->bo, (size_t)ptr); + + cl_context_add_ref(ctx); + mem->ctx = ctx; + + /* Append the svm in the context svm list */ + pthread_mutex_lock(&ctx->svm_lock); + mem->next = ctx->svm_buffers; + if (ctx->svm_buffers != NULL) + ctx->svm_buffers->prev = mem; + ctx->svm_buffers = mem; + pthread_mutex_unlock(&ctx->svm_lock); +#else + printf("Warning: Need libdrm that support userptr and soft-pin to enable SVM."); +#endif + + return ptr; +} + void cl_mem_copy_image_region(const size_t *origin, const size_t *region, void *dst, size_t dst_row_pitch, size_t dst_slice_pitch, @@ -1153,6 +1249,18 @@ cl_mem_new_image(cl_context context, } LOCAL void +cl_mem_svm_delete(cl_context ctx, void *svm_pointer) +{ + cl_mem mem; + if(UNLIKELY(svm_pointer == NULL)) + return; + mem = cl_context_get_svm_from_ptr(ctx, svm_pointer); + if(mem == NULL) + return; + cl_mem_delete(mem); +} + +LOCAL void cl_mem_delete(cl_mem mem) { cl_int i; @@ -1234,13 +1342,18 @@ cl_mem_delete(cl_mem mem) buffer->parent->subs = buffer->sub_next; pthread_mutex_unlock(&buffer->parent->sub_lock); cl_mem_delete((cl_mem )(buffer->parent)); - } else if (LIKELY(mem->bo != NULL)) { + } else if(mem->is_svm && mem->type != CL_MEM_SVM_TYPE) { + cl_mem svm_mem = cl_context_get_svm_from_ptr(mem->ctx, mem->host_ptr); + if(svm_mem) + cl_mem_delete(svm_mem); + }else if (LIKELY(mem->bo != NULL)) { cl_buffer_unreference(mem->bo); } - if (mem->is_userptr && + if ((mem->is_userptr && (mem->flags & CL_MEM_ALLOC_HOST_PTR) && - (mem->type != CL_MEM_SUBBUFFER_TYPE)) + (mem->type != CL_MEM_SUBBUFFER_TYPE)) || + (mem->is_svm && mem->type == CL_MEM_SVM_TYPE)) cl_free(mem->host_ptr); cl_free(mem); diff --git a/src/cl_mem.h b/src/cl_mem.h index 4970a75..df23345 100644 --- a/src/cl_mem.h +++ b/src/cl_mem.h @@ -70,6 +70,7 @@ typedef struct _cl_mem_dstr_cb { enum cl_mem_type { CL_MEM_BUFFER_TYPE, CL_MEM_SUBBUFFER_TYPE, + CL_MEM_SVM_TYPE, CL_MEM_IMAGE_TYPE, CL_MEM_GL_IMAGE_TYPE, CL_MEM_BUFFER1D_IMAGE_TYPE @@ -93,10 +94,16 @@ typedef struct _cl_mem { int map_ref; /* The mapped count. */ uint8_t mapped_gtt; /* This object has mapped gtt, for unmap. */ cl_mem_dstr_cb *dstr_cb; /* The destroy callback. */ - uint8_t is_userptr; /* CL_MEM_USE_HOST_PTR is enabled*/ + uint8_t is_userptr; /* CL_MEM_USE_HOST_PTR is enabled */ + cl_bool is_svm; /* This object is svm */ size_t offset; /* offset of host_ptr to the page beginning, only for CL_MEM_USE_HOST_PTR*/ } _cl_mem; +typedef struct _cl_mem_svm { + _cl_mem base; + cl_svm_mem_flags flags; /* Flags specified at the creation time */ +} _cl_mem_svm; + struct _cl_mem_image { _cl_mem base; cl_image_format fmt; /* only for images */ @@ -195,6 +202,10 @@ extern cl_mem cl_mem_new_buffer(cl_context, cl_mem_flags, size_t, void*, cl_int* /* Create a new sub memory object */ extern cl_mem cl_mem_new_sub_buffer(cl_mem, cl_mem_flags, cl_buffer_create_type, const void *, cl_int *); +void* cl_mem_svm_allocate(cl_context, cl_svm_mem_flags, size_t, unsigned int); +void cl_mem_svm_delete(cl_context, void *svm_pointer); + + /* Idem but this is an image */ extern cl_mem cl_mem_new_image(cl_context context, diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c index 782a2de..7eaa6c5 100644 --- a/src/intel/intel_driver.c +++ b/src/intel/intel_driver.c @@ -832,8 +832,8 @@ intel_update_device_info(cl_device_id device) //We should get the device memory dynamically, but the //mapablce mem size usage is unknown. Just ignore it. size_t total_mem,map_mem; - if(drm_intel_get_aperture_sizes(driver->fd,&map_mem,&total_mem) == 0) - device->global_mem_size = (cl_ulong)total_mem; + //if(drm_intel_get_aperture_sizes(driver->fd,&map_mem,&total_mem) == 0) + // device->global_mem_size = (cl_ulong)total_mem; intel_driver_context_destroy(driver); intel_driver_close(driver); @@ -853,6 +853,7 @@ intel_setup_callbacks(void) cl_driver_update_device_info = (cl_driver_update_device_info_cb *) intel_update_device_info; cl_buffer_alloc = (cl_buffer_alloc_cb *) drm_intel_bo_alloc; cl_buffer_alloc_userptr = (cl_buffer_alloc_userptr_cb*) intel_buffer_alloc_userptr; + cl_buffer_set_softpin_offset = (cl_buffer_set_softpin_offset_cb *) drm_intel_bo_set_softpin_offset; cl_buffer_set_tiling = (cl_buffer_set_tiling_cb *) intel_buffer_set_tiling; #if defined(HAS_EGL) cl_buffer_alloc_from_texture = (cl_buffer_alloc_from_texture_cb *) intel_alloc_buffer_from_texture; -- 1.9.1

1 0

[PATCH] drm/sti: load HQVDP firmware the first time HQVDP's plane is used
by Vincent Abriou 04 Nov '15

04 Nov '15

The way to load the HQVDP firmware has been updated. HQVDP firmware is now loaded the first time an HQVDP plane is used and no more when the HQVDP driver is bound. This solves the dependency we had on the file system availability. The first time the HQVDP plane is used, we are sure that file system is available so request_firmware function will match. CONFIG_FW_LOADER_USER_HELPER_FALLBACK is then no more mandatory. Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Vincent Abriou <vincent.abriou(a)st.com> --- drivers/gpu/drm/sti/Kconfig | 1 - drivers/gpu/drm/sti/sti_hqvdp.c | 302 ++++++++++++++++++++-------------------- 2 files changed, 150 insertions(+), 153 deletions(-) diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index 3f8d590..10c1b19 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -7,6 +7,5 @@ config DRM_STI select DRM_KMS_CMA_HELPER select DRM_PANEL select FW_LOADER - select FW_LOADER_USER_HELPER_FALLBACK help Choose this option to enable DRM on STM stiH41x chipset diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index 348c7c5..ea0690b 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c @@ -628,6 +628,153 @@ static void sti_hqvdp_init(struct sti_hqvdp *hqvdp) memset(hqvdp->hqvdp_cmd, 0, size); } +static void sti_hqvdp_init_plugs(struct sti_hqvdp *hqvdp) +{ + /* Configure Plugs (same for RD & WR) */ + writel(PLUG_PAGE_SIZE_256, hqvdp->regs + HQVDP_RD_PLUG_PAGE_SIZE); + writel(PLUG_MIN_OPC_8, hqvdp->regs + HQVDP_RD_PLUG_MIN_OPC); + writel(PLUG_MAX_OPC_64, hqvdp->regs + HQVDP_RD_PLUG_MAX_OPC); + writel(PLUG_MAX_CHK_2X, hqvdp->regs + HQVDP_RD_PLUG_MAX_CHK); + writel(PLUG_MAX_MSG_1X, hqvdp->regs + HQVDP_RD_PLUG_MAX_MSG); + writel(PLUG_MIN_SPACE_1, hqvdp->regs + HQVDP_RD_PLUG_MIN_SPACE); + writel(PLUG_CONTROL_ENABLE, hqvdp->regs + HQVDP_RD_PLUG_CONTROL); + + writel(PLUG_PAGE_SIZE_256, hqvdp->regs + HQVDP_WR_PLUG_PAGE_SIZE); + writel(PLUG_MIN_OPC_8, hqvdp->regs + HQVDP_WR_PLUG_MIN_OPC); + writel(PLUG_MAX_OPC_64, hqvdp->regs + HQVDP_WR_PLUG_MAX_OPC); + writel(PLUG_MAX_CHK_2X, hqvdp->regs + HQVDP_WR_PLUG_MAX_CHK); + writel(PLUG_MAX_MSG_1X, hqvdp->regs + HQVDP_WR_PLUG_MAX_MSG); + writel(PLUG_MIN_SPACE_1, hqvdp->regs + HQVDP_WR_PLUG_MIN_SPACE); + writel(PLUG_CONTROL_ENABLE, hqvdp->regs + HQVDP_WR_PLUG_CONTROL); +} + +/** + * sti_hqvdp_start_xp70 + * @hqvdp: hqvdp pointer + * + * Run the xP70 initialization sequence + */ +static void sti_hqvdp_start_xp70(struct sti_hqvdp *hqvdp) +{ + const struct firmware *firmware; + u32 *fw_rd_plug, *fw_wr_plug, *fw_pmem, *fw_dmem; + u8 *data; + int i; + struct fw_header { + int rd_size; + int wr_size; + int pmem_size; + int dmem_size; + } *header; + + DRM_DEBUG_DRIVER("\n"); + + if (hqvdp->xp70_initialized) { + DRM_INFO("HQVDP XP70 already initialized\n"); + return; + } + + /* Request firmware */ + if (request_firmware(&firmware, HQVDP_FMW_NAME, hqvdp->dev)) { + DRM_ERROR("Can't get HQVDP firmware\n"); + return; + } + + /* Check firmware parts */ + if (!firmware) { + DRM_ERROR("Firmware not available\n"); + return; + } + + header = (struct fw_header *)firmware->data; + if (firmware->size < sizeof(*header)) { + DRM_ERROR("Invalid firmware size (%d)\n", firmware->size); + goto out; + } + if ((sizeof(*header) + header->rd_size + header->wr_size + + header->pmem_size + header->dmem_size) != firmware->size) { + DRM_ERROR("Invalid fmw structure (%d+%d+%d+%d+%d != %d)\n", + sizeof(*header), header->rd_size, header->wr_size, + header->pmem_size, header->dmem_size, + firmware->size); + goto out; + } + + data = (u8 *)firmware->data; + data += sizeof(*header); + fw_rd_plug = (void *)data; + data += header->rd_size; + fw_wr_plug = (void *)data; + data += header->wr_size; + fw_pmem = (void *)data; + data += header->pmem_size; + fw_dmem = (void *)data; + + /* Enable clock */ + if (clk_prepare_enable(hqvdp->clk)) + DRM_ERROR("Failed to prepare/enable HQVDP clk\n"); + + /* Reset */ + writel(SW_RESET_CTRL_FULL, hqvdp->regs + HQVDP_MBX_SW_RESET_CTRL); + + for (i = 0; i < POLL_MAX_ATTEMPT; i++) { + if (readl(hqvdp->regs + HQVDP_MBX_STARTUP_CTRL1) + & STARTUP_CTRL1_RST_DONE) + break; + msleep(POLL_DELAY_MS); + } + if (i == POLL_MAX_ATTEMPT) { + DRM_ERROR("Could not reset\n"); + goto out; + } + + /* Init Read & Write plugs */ + for (i = 0; i < header->rd_size / 4; i++) + writel(fw_rd_plug[i], hqvdp->regs + HQVDP_RD_PLUG + i * 4); + for (i = 0; i < header->wr_size / 4; i++) + writel(fw_wr_plug[i], hqvdp->regs + HQVDP_WR_PLUG + i * 4); + + sti_hqvdp_init_plugs(hqvdp); + + /* Authorize Idle Mode */ + writel(STARTUP_CTRL1_AUTH_IDLE, hqvdp->regs + HQVDP_MBX_STARTUP_CTRL1); + + /* Prevent VTG interruption during the boot */ + writel(SOFT_VSYNC_SW_CTRL_IRQ, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC); + writel(0, hqvdp->regs + HQVDP_MBX_NEXT_CMD); + + /* Download PMEM & DMEM */ + for (i = 0; i < header->pmem_size / 4; i++) + writel(fw_pmem[i], hqvdp->regs + HQVDP_PMEM + i * 4); + for (i = 0; i < header->dmem_size / 4; i++) + writel(fw_dmem[i], hqvdp->regs + HQVDP_DMEM + i * 4); + + /* Enable fetch */ + writel(STARTUP_CTRL2_FETCH_EN, hqvdp->regs + HQVDP_MBX_STARTUP_CTRL2); + + /* Wait end of boot */ + for (i = 0; i < POLL_MAX_ATTEMPT; i++) { + if (readl(hqvdp->regs + HQVDP_MBX_INFO_XP70) + & INFO_XP70_FW_READY) + break; + msleep(POLL_DELAY_MS); + } + if (i == POLL_MAX_ATTEMPT) { + DRM_ERROR("Could not boot\n"); + goto out; + } + + /* Launch Vsync */ + writel(SOFT_VSYNC_HW, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC); + + DRM_INFO("HQVDP XP70 initialized\n"); + + hqvdp->xp70_initialized = true; + +out: + release_firmware(firmware); +} + static void sti_hqvdp_atomic_update(struct drm_plane *drm_plane, struct drm_plane_state *oldstate) { @@ -754,6 +901,9 @@ static void sti_hqvdp_atomic_update(struct drm_plane *drm_plane, sti_hqvdp_update_hvsrc(HVSRC_VERT, scale_v, &cmd->hvsrc); if (first_prepare) { + /* Start HQVDP XP70 coprocessor */ + sti_hqvdp_start_xp70(hqvdp); + /* Prevent VTG shutdown */ if (clk_prepare_enable(hqvdp->clk_pix_main)) { DRM_ERROR("Failed to prepare/enable pix main clk\n"); @@ -836,168 +986,16 @@ static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev, return &hqvdp->plane.drm_plane; } -static void sti_hqvdp_init_plugs(struct sti_hqvdp *hqvdp) -{ - /* Configure Plugs (same for RD & WR) */ - writel(PLUG_PAGE_SIZE_256, hqvdp->regs + HQVDP_RD_PLUG_PAGE_SIZE); - writel(PLUG_MIN_OPC_8, hqvdp->regs + HQVDP_RD_PLUG_MIN_OPC); - writel(PLUG_MAX_OPC_64, hqvdp->regs + HQVDP_RD_PLUG_MAX_OPC); - writel(PLUG_MAX_CHK_2X, hqvdp->regs + HQVDP_RD_PLUG_MAX_CHK); - writel(PLUG_MAX_MSG_1X, hqvdp->regs + HQVDP_RD_PLUG_MAX_MSG); - writel(PLUG_MIN_SPACE_1, hqvdp->regs + HQVDP_RD_PLUG_MIN_SPACE); - writel(PLUG_CONTROL_ENABLE, hqvdp->regs + HQVDP_RD_PLUG_CONTROL); - - writel(PLUG_PAGE_SIZE_256, hqvdp->regs + HQVDP_WR_PLUG_PAGE_SIZE); - writel(PLUG_MIN_OPC_8, hqvdp->regs + HQVDP_WR_PLUG_MIN_OPC); - writel(PLUG_MAX_OPC_64, hqvdp->regs + HQVDP_WR_PLUG_MAX_OPC); - writel(PLUG_MAX_CHK_2X, hqvdp->regs + HQVDP_WR_PLUG_MAX_CHK); - writel(PLUG_MAX_MSG_1X, hqvdp->regs + HQVDP_WR_PLUG_MAX_MSG); - writel(PLUG_MIN_SPACE_1, hqvdp->regs + HQVDP_WR_PLUG_MIN_SPACE); - writel(PLUG_CONTROL_ENABLE, hqvdp->regs + HQVDP_WR_PLUG_CONTROL); -} - -/** - * sti_hqvdp_start_xp70 - * @firmware: firmware found - * @ctxt: hqvdp structure - * - * Run the xP70 initialization sequence - */ -static void sti_hqvdp_start_xp70(const struct firmware *firmware, void *ctxt) -{ - struct sti_hqvdp *hqvdp = ctxt; - u32 *fw_rd_plug, *fw_wr_plug, *fw_pmem, *fw_dmem; - u8 *data; - int i; - struct fw_header { - int rd_size; - int wr_size; - int pmem_size; - int dmem_size; - } *header; - - DRM_DEBUG_DRIVER("\n"); - - if (hqvdp->xp70_initialized) { - DRM_INFO("HQVDP XP70 already initialized\n"); - return; - } - - /* Check firmware parts */ - if (!firmware) { - DRM_ERROR("Firmware not available\n"); - return; - } - - header = (struct fw_header *) firmware->data; - if (firmware->size < sizeof(*header)) { - DRM_ERROR("Invalid firmware size (%d)\n", firmware->size); - goto out; - } - if ((sizeof(*header) + header->rd_size + header->wr_size + - header->pmem_size + header->dmem_size) != firmware->size) { - DRM_ERROR("Invalid fmw structure (%d+%d+%d+%d+%d != %d)\n", - sizeof(*header), header->rd_size, header->wr_size, - header->pmem_size, header->dmem_size, - firmware->size); - goto out; - } - - data = (u8 *) firmware->data; - data += sizeof(*header); - fw_rd_plug = (void *) data; - data += header->rd_size; - fw_wr_plug = (void *) data; - data += header->wr_size; - fw_pmem = (void *) data; - data += header->pmem_size; - fw_dmem = (void *) data; - - /* Enable clock */ - if (clk_prepare_enable(hqvdp->clk)) - DRM_ERROR("Failed to prepare/enable HQVDP clk\n"); - - /* Reset */ - writel(SW_RESET_CTRL_FULL, hqvdp->regs + HQVDP_MBX_SW_RESET_CTRL); - - for (i = 0; i < POLL_MAX_ATTEMPT; i++) { - if (readl(hqvdp->regs + HQVDP_MBX_STARTUP_CTRL1) - & STARTUP_CTRL1_RST_DONE) - break; - msleep(POLL_DELAY_MS); - } - if (i == POLL_MAX_ATTEMPT) { - DRM_ERROR("Could not reset\n"); - goto out; - } - - /* Init Read & Write plugs */ - for (i = 0; i < header->rd_size / 4; i++) - writel(fw_rd_plug[i], hqvdp->regs + HQVDP_RD_PLUG + i * 4); - for (i = 0; i < header->wr_size / 4; i++) - writel(fw_wr_plug[i], hqvdp->regs + HQVDP_WR_PLUG + i * 4); - - sti_hqvdp_init_plugs(hqvdp); - - /* Authorize Idle Mode */ - writel(STARTUP_CTRL1_AUTH_IDLE, hqvdp->regs + HQVDP_MBX_STARTUP_CTRL1); - - /* Prevent VTG interruption during the boot */ - writel(SOFT_VSYNC_SW_CTRL_IRQ, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC); - writel(0, hqvdp->regs + HQVDP_MBX_NEXT_CMD); - - /* Download PMEM & DMEM */ - for (i = 0; i < header->pmem_size / 4; i++) - writel(fw_pmem[i], hqvdp->regs + HQVDP_PMEM + i * 4); - for (i = 0; i < header->dmem_size / 4; i++) - writel(fw_dmem[i], hqvdp->regs + HQVDP_DMEM + i * 4); - - /* Enable fetch */ - writel(STARTUP_CTRL2_FETCH_EN, hqvdp->regs + HQVDP_MBX_STARTUP_CTRL2); - - /* Wait end of boot */ - for (i = 0; i < POLL_MAX_ATTEMPT; i++) { - if (readl(hqvdp->regs + HQVDP_MBX_INFO_XP70) - & INFO_XP70_FW_READY) - break; - msleep(POLL_DELAY_MS); - } - if (i == POLL_MAX_ATTEMPT) { - DRM_ERROR("Could not boot\n"); - goto out; - } - - /* Launch Vsync */ - writel(SOFT_VSYNC_HW, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC); - - DRM_INFO("HQVDP XP70 initialized\n"); - - hqvdp->xp70_initialized = true; - -out: - release_firmware(firmware); -} - int sti_hqvdp_bind(struct device *dev, struct device *master, void *data) { struct sti_hqvdp *hqvdp = dev_get_drvdata(dev); struct drm_device *drm_dev = data; struct drm_plane *plane; - int err; DRM_DEBUG_DRIVER("\n"); hqvdp->drm_dev = drm_dev; - /* Request for firmware */ - err = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, - HQVDP_FMW_NAME, hqvdp->dev, - GFP_KERNEL, hqvdp, sti_hqvdp_start_xp70); - if (err) { - DRM_ERROR("Can't get HQVDP firmware\n"); - return err; - } - /* Create HQVDP plane once xp70 is initialized */ plane = sti_hqvdp_create(drm_dev, hqvdp->dev, STI_HQVDP_0); if (!plane) -- 1.9.1

3 2

[RFC 0/6] drm: Add DRM_FBDEV_EMULATION Kconfig option
by Archit Taneja 04 Nov '15

04 Nov '15

This provides a uniform interface to enable/disable legacy fbdev support for modesetting drivers, based on the discussion here: http://lists.freedesktop.org/archives/dri-devel/2015-March/078729.html This has only been build-tested for a few devices. Mainly looking for comments for now. The drivers that provide fbdev emulation by default won't be impacted by this. However, if we could make all drivers use DRM_FBDEV_EMULATION, it would clean up individual Kconfigs, and have a centralized place where we touch FB_* configs. Archit Taneja (6): drm: Add top level Kconfig option for DRM fbdev emulation drm/msm: Remove local fbdev emulation Kconfig option drm/i915: Remove local fbdev emulation Kconfig option drm/tegra: Remove local fbdev emulation Kconfig option drm/imx: Remove local fbdev emulation Kconfig option drm/sti: Remove local fbdev emulation Kconfig option drivers/gpu/drm/Kconfig | 18 ++++++ drivers/gpu/drm/Makefile | 4 ++ drivers/gpu/drm/i915/Kconfig | 15 ----- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/intel_display.c | 10 ++- drivers/gpu/drm/i915/intel_dp_mst.c | 14 ++-- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_fbdev.c | 7 -- drivers/gpu/drm/imx/Kconfig | 9 --- drivers/gpu/drm/imx/imx-drm-core.c | 10 +-- drivers/gpu/drm/msm/Kconfig | 14 ---- drivers/gpu/drm/msm/Makefile | 2 +- drivers/gpu/drm/msm/msm_drv.c | 4 +- drivers/gpu/drm/sti/Kconfig | 6 -- drivers/gpu/drm/sti/sti_drm_drv.c | 2 +- drivers/gpu/drm/tegra/Kconfig | 12 ---- drivers/gpu/drm/tegra/drm.c | 15 +++-- drivers/gpu/drm/tegra/drm.h | 8 --- drivers/gpu/drm/tegra/fb.c | 25 ++------ include/drm/drm_fb_helper.h | 120 +++++++++++++++++++++++++++++++++++ 22 files changed, 179 insertions(+), 127 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation

8 56

[Bug 92790] Radeon.mst error
by bugzilla-daemon＠freedesktop.org 04 Nov '15

04 Nov '15

1 0

[GIT PULL] exynos-drm-next
by Inki Dae 03 Nov '15

03 Nov '15

Hi Dave, This pull request includes comprehensive cleanups to HDMI part and several fixups, and revive a Exynos specific interface which was used to get fake offset, which is required for application using render node to access a gem memory. For userspace codes for the use of this interface, you can refer to below link, https://github.com/dofmind/libdrm/commit/5cc58d765c61b37a26372de9701f3ffe3a… We will post a patch for libdrm after this patch is merged to mainline. In addition, this pull request includes also a defconfig patch which enables mixer driver as default. For this, I got already Acked-by from Krzysztof Kozlowski who is a Exynos SoC maintainer. Please kindly let me know if there is any problem. Thanks, Inki Dae The following changes since commit d7e1bc3f5e70c5a106606e33cfa4d413459611ba: Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next (2015-10-23 11:54:03 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos exynos-drm-next for you to fetch changes up to 01bdaac3d7febed08e1b257a9cbb07e04ba8ce4c: ARM: exynos_defconfig: enable Exynos DRM Mixer driver (2015-10-28 15:18:31 +0900) ---------------------------------------------------------------- Andrzej Hajda (27): drm/exynos/hdmi: remove support for deprecated compatible drm/exynos/hdmi: use mappings for registers with IP dependent address drm/exynos/hdmi: move PLL stabilization check code to separate function drm/exynos/hdmi: simplify HDMI-PHY power sequence drm/exynos/hdmi: replace all writeb with writel drm/exynos/hdmi: fix removal order drm/exynos/hdmi: use optional regulator_get for hdmi-en drm/exynos/hdmi: use constant size array for regulators drm/exynos/hdmi: simplify clock re-parenting drm/exynos/hdmi: convert to gpiod API drm/exynos/hdmi: remove deprecated hdmi_resources structure drm/exynos/hdmi: convert container_of macro to inline function drm/exynos/hdmi: improve HDMI/ACR related code drm/exynos/hdmi: remove unused field drm/exynos/decon5433: add PCLK clock drm/exynos/decon5433: fix timing registers writes drm/exynos/decon5433: add function to set particular register bits drm/exynos/decon5433: merge different flag fields drm/exynos/decon5433: remove duplicated initialization drm/exynos/decon5433: add support for DECON-TV drm/exynos: add atomic_check callback to exynos_crtc drm/exynos/mixer: replace direct cross-driver call with drm mode validation drm/exynos: separate Mixer and HDMI drivers drm/exynos: abstract out common dependency drm/exynos: re-arrange Kconfig entries drm/exynos: simplify Kconfig component names ARM: exynos_defconfig: enable Exynos DRM Mixer driver Gustavo Padovan (2): drm/exynos: add global macro for the default primary plane drm/exynos: add cursor plane support Ingi Kim (1): drm/exynos: fix spelling errors Joonyoung Shim (3): drm/exynos: fix to detach device of iommu drm/exynos: cleanup name of gem object for exynos_drm drm/exynos: add DRM_EXYNOS_GEM_MAP ioctl Tomasz Stanislawski (1): drm: exynos: mixer: fix using usleep() in atomic context arch/arm/configs/exynos_defconfig | 1 + drivers/gpu/drm/exynos/Kconfig | 75 ++-- drivers/gpu/drm/exynos/Makefile | 3 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 324 +++++++++-------- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 12 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 + drivers/gpu/drm/exynos/exynos_drm_fb.c | 45 ++- drivers/gpu/drm/exynos/exynos_drm_fb.h | 5 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 53 +-- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 16 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 248 +++++++------ drivers/gpu/drm/exynos/exynos_drm_gem.h | 19 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 12 +- drivers/gpu/drm/exynos/exynos_drm_iommu.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 20 +- drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 496 +++++++++----------------- drivers/gpu/drm/exynos/exynos_mixer.c | 17 +- drivers/gpu/drm/exynos/exynos_mixer.h | 20 -- drivers/gpu/drm/exynos/regs-hdmi.h | 33 +- include/uapi/drm/exynos_drm.h | 17 +- include/video/exynos5433_decon.h | 29 ++ 26 files changed, 703 insertions(+), 780 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h

3 13

[Bug 107121] New: Backlight shuts off with radeon driver
by bugzilla-daemon＠bugzilla.kernel.org 03 Nov '15

03 Nov '15

https://bugzilla.kernel.org/show_bug.cgi?id=107121 Bug ID: 107121 Summary: Backlight shuts off with radeon driver Product: Drivers Version: 2.5 Kernel Version: Linux-4.2.5-1-x86_64 Hardware: x86-64 OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: solloron1(a)gmail.com Regression: No Created attachment 191951 --> https://bugzilla.kernel.org/attachment.cgi?id=191951&action=edit Xorg.0.log from Lenovo T60p After installing that version of the kernel the backlight on my machine(Lenovo T60p ATI FireGL V5250) would shut off after the bootloader(grub2). Problem was resolved by downgrading kernel to 4.2.3-1-x86_64. -- You are receiving this mail because: You are watching the assignee of the bug.

1 1

[PATCH 1/2] intel: Add SKL GT4 PCI IDs
by Ben Widawsky 03 Nov '15

03 Nov '15

Cc: Kristian Høgsberg <krh(a)bitplanet.net> Cc: Damien Lespiau <damien.lespiau(a)intel.com> Signed-off-by: Ben Widawsky <benjamin.widawsky(a)intel.com> --- intel/intel_chipset.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h index 253ea71..6c8dc73 100644 --- a/intel/intel_chipset.h +++ b/intel/intel_chipset.h @@ -180,6 +180,10 @@ #define PCI_CHIP_SKYLAKE_SRV_GT3 0x192A #define PCI_CHIP_SKYLAKE_SRV_GT1 0x190A #define PCI_CHIP_SKYLAKE_WKS_GT2 0x191D +#define PCI_CHIP_SKYLAKE_DT_GT4 0x1932 +#define PCI_CHIP_SKYLAKE_SRV_GT4 0x193A +#define PCI_CHIP_SKYLAKE_H_GT4 0x193B +#define PCI_CHIP_SKYLAKE_WKS_GT4 0x193D #define PCI_CHIP_BROXTON_0 0x0A84 #define PCI_CHIP_BROXTON_1 0x1A84 @@ -362,9 +366,15 @@ (devid) == PCI_CHIP_SKYLAKE_HALO_GT3 || \ (devid) == PCI_CHIP_SKYLAKE_SRV_GT3) +#define IS_SKL_GT4(devid) ((devid) == PCI_CHIP_SKYLAKE_DT_GT4 || \ + (devid) == PCI_CHIP_SKYLAKE_SRV_GT4 || \ + (devid) == PCI_CHIP_SKYLAKE_H_GT4 || \ + (devid) == PCI_CHIP_SKYLAKE_WKS_GT4) + #define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || \ IS_SKL_GT2(devid) || \ - IS_SKL_GT3(devid)) + IS_SKL_GT3(devid) || \ + IS_SKL_GT4(devid)) #define IS_BROXTON(devid) ((devid) == PCI_CHIP_BROXTON_0 || \ (devid) == PCI_CHIP_BROXTON_1 || \ -- 2.6.1

2 2

[PATCH] drm/amdgpu: don't oops on failure to load
by Dave Airlie 03 Nov '15

03 Nov '15

From: Dave Airlie <airlied(a)redhat.com> In two places amdgpu tries to tear down something it hasn't initalised when failing. This is what happens when you enable experimental support on topaz which then fails in ring init. This patch allows it to fail cleanly. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 +++ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index e0b80cc..fec65f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -69,6 +69,9 @@ void amdgpu_ctx_fini(struct amdgpu_ctx *ctx) struct amdgpu_device *adev = ctx->adev; unsigned i, j; + if (!adev) + return; + for (i = 0; i < AMDGPU_MAX_RINGS; ++i) for (j = 0; j < AMDGPU_CTX_MAX_CS_PENDING; ++j) fence_put(ctx->rings[i].fences[j]); diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 7fa1d7a..d3b9eb7 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -462,5 +462,6 @@ int amd_sched_init(struct amd_gpu_scheduler *sched, */ void amd_sched_fini(struct amd_gpu_scheduler *sched) { - kthread_stop(sched->thread); + if (sched->thread) + kthread_stop(sched->thread); } -- 2.5.0

4 3

[PATCH] drm/gem: remove unused variable in drm_gem_cma_prime_mmap
by Arnd Bergmann 03 Nov '15

03 Nov '15

Now that the mutex is no longer used in drm_gem_cma_prime_mmap, the 'dev' variable is not referenced either, which gcc warns about: drivers/gpu/drm/drm_gem_cma_helper.c:484:21: warning: unused variable 'dev' This removes it too. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 4e270f088011 ("drm/gem: Drop struct_mutex requirement from drm_gem_mmap_obj") --- Currently in drm-next, warning found on yesterday's linux-next with ARM randconfig builds diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 4fb4c45d039f..e109b49cd25d 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -481,7 +481,6 @@ int drm_gem_cma_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) { struct drm_gem_cma_object *cma_obj; - struct drm_device *dev = obj->dev; int ret; ret = drm_gem_mmap_obj(obj, obj->size, vma);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2015