Skip to content

Commit 0def4b7

Browse files
airliedairlied
committed
Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix.de/git/lst/linux into drm-next
things are still slow in etnaviv land. Just one hardware support addition for the GPU found on the NXP Layerscape LS1028A SoC from Michael and the GEM mmap cleanup from Thomas. Signed-off-by: Dave Airlie <[email protected]> From: Lucas Stach <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 697b6e2 + 81fd23e commit 0def4b7

File tree

6 files changed

+44
-41
lines changed

6 files changed

+44
-41
lines changed

‎drivers/gpu/drm/etnaviv/etnaviv_drv.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,7 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = {
468468
ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),
469469
};
470470

471-
static const struct file_operations fops = {
472-
.owner = THIS_MODULE,
473-
.open = drm_open,
474-
.release = drm_release,
475-
.unlocked_ioctl = drm_ioctl,
476-
.compat_ioctl = drm_compat_ioctl,
477-
.poll = drm_poll,
478-
.read = drm_read,
479-
.llseek = no_llseek,
480-
.mmap = etnaviv_gem_mmap,
481-
};
471+
DEFINE_DRM_GEM_FOPS(fops);
482472

483473
static const struct drm_driver etnaviv_drm_driver = {
484474
.driver_features = DRIVER_GEM | DRIVER_RENDER,
@@ -487,7 +477,7 @@ static const struct drm_driver etnaviv_drm_driver = {
487477
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
488478
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
489479
.gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table,
490-
.gem_prime_mmap = etnaviv_gem_prime_mmap,
480+
.gem_prime_mmap = drm_gem_prime_mmap,
491481
#ifdef CONFIG_DEBUG_FS
492482
.debugfs_init = etnaviv_debugfs_init,
493483
#endif

‎drivers/gpu/drm/etnaviv/etnaviv_drv.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ struct etnaviv_drm_private {
4747
int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
4848
struct drm_file *file);
4949

50-
int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);
5150
int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset);
5251
struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj);
5352
int etnaviv_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
54-
int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,
55-
struct vm_area_struct *vma);
5653
struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
5754
struct dma_buf_attachment *attach, struct sg_table *sg);
5855
int etnaviv_gem_prime_pin(struct drm_gem_object *obj);

‎drivers/gpu/drm/etnaviv/etnaviv_gem.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
130130
{
131131
pgprot_t vm_page_prot;
132132

133-
vma->vm_flags &= ~VM_PFNMAP;
134-
vma->vm_flags |= VM_MIXEDMAP;
133+
vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP;
135134

136135
vm_page_prot = vm_get_page_prot(vma->vm_flags);
137136

@@ -154,19 +153,11 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
154153
return 0;
155154
}
156155

157-
int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma)
156+
static int etnaviv_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
158157
{
159-
struct etnaviv_gem_object *obj;
160-
int ret;
161-
162-
ret = drm_gem_mmap(filp, vma);
163-
if (ret) {
164-
DBG("mmap failed: %d", ret);
165-
return ret;
166-
}
158+
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
167159

168-
obj = to_etnaviv_bo(vma->vm_private_data);
169-
return obj->ops->mmap(obj, vma);
160+
return etnaviv_obj->ops->mmap(etnaviv_obj, vma);
170161
}
171162

172163
static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf)
@@ -567,6 +558,7 @@ static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = {
567558
.unpin = etnaviv_gem_prime_unpin,
568559
.get_sg_table = etnaviv_gem_prime_get_sg_table,
569560
.vmap = etnaviv_gem_prime_vmap,
561+
.mmap = etnaviv_gem_mmap,
570562
.vm_ops = &vm_ops,
571563
};
572564

‎drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,6 @@ int etnaviv_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
3434
return 0;
3535
}
3636

37-
int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,
38-
struct vm_area_struct *vma)
39-
{
40-
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
41-
int ret;
42-
43-
ret = drm_gem_mmap_obj(obj, obj->size, vma);
44-
if (ret < 0)
45-
return ret;
46-
47-
return etnaviv_obj->ops->mmap(etnaviv_obj, vma);
48-
}
49-
5037
int etnaviv_gem_prime_pin(struct drm_gem_object *obj)
5138
{
5239
if (!obj->import_attach) {

‎drivers/gpu/drm/etnaviv/etnaviv_gpu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,12 @@ static void etnaviv_gpu_enable_mlcg(struct etnaviv_gpu *gpu)
613613
etnaviv_is_model_rev(gpu, GC2000, 0x5108))
614614
pmc |= VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_TX;
615615

616+
/* Disable SE, RA and TX clock gating on affected core revisions. */
617+
if (etnaviv_is_model_rev(gpu, GC7000, 0x6202))
618+
pmc |= VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_SE |
619+
VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA |
620+
VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_TX;
621+
616622
pmc |= VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA_HZ;
617623
pmc |= VIVS_PM_MODULE_CONTROLS_DISABLE_MODULE_CLOCK_GATING_RA_EZ;
618624

‎drivers/gpu/drm/etnaviv/etnaviv_hwdb.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,37 @@ static const struct etnaviv_chip_identity etnaviv_chip_identities[] = {
3737
.minor_features10 = 0x0,
3838
.minor_features11 = 0x0,
3939
},
40+
{
41+
.model = 0x7000,
42+
.revision = 0x6202,
43+
.product_id = 0x70003,
44+
.customer_id = 0,
45+
.eco_id = 0,
46+
.stream_count = 8,
47+
.register_max = 64,
48+
.thread_count = 512,
49+
.shader_core_count = 2,
50+
.vertex_cache_size = 16,
51+
.vertex_output_buffer_size = 1024,
52+
.pixel_pipes = 1,
53+
.instruction_count = 512,
54+
.num_constants = 320,
55+
.buffer_size = 0,
56+
.varyings_count = 16,
57+
.features = 0xe0287cad,
58+
.minor_features0 = 0xc1489eff,
59+
.minor_features1 = 0xfefbfad9,
60+
.minor_features2 = 0xeb9d4fbf,
61+
.minor_features3 = 0xedfffced,
62+
.minor_features4 = 0xdb0dafc7,
63+
.minor_features5 = 0x3b5ac333,
64+
.minor_features6 = 0xfccee201,
65+
.minor_features7 = 0x03fffa6f,
66+
.minor_features8 = 0x00e10ef0,
67+
.minor_features9 = 0x0088003c,
68+
.minor_features10 = 0x00004040,
69+
.minor_features11 = 0x00000024,
70+
},
4071
{
4172
.model = 0x7000,
4273
.revision = 0x6204,

0 commit comments

Comments
 (0)