Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ddd8e9594a2fc2b5bff40308483ec16a88e295ff

Authored by YoungJun Cho
Committed by Inki Dae
1 parent 4744ad2414
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drm/exynos: remove unused vaddr member 

This patch removes vaddr member from exynos_drm_overlay structure
and also relevant codes for code cleanup.

Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

Showing 5 changed files with 4 additions and 20 deletions Side-by-side Diff

drivers/gpu/drm/exynos/exynos_drm_drv.h
Diff comments   View file @ ddd8e95
... ... @@ -107,7 +107,6 @@
107 107 * @pixel_format: fourcc pixel format of this overlay
108 108 * @dma_addr: array of bus(accessed by dma) address to the memory region
109 109 * allocated for a overlay.
110   - * @vaddr: array of virtual memory addresss to this overlay.
111 110 * @zpos: order of overlay layer(z position).
112 111 * @default_win: a window to be enabled.
113 112 * @color_key: color key on or off.
... ... @@ -139,7 +138,6 @@
139 138 unsigned int pitch;
140 139 uint32_t pixel_format;
141 140 dma_addr_t dma_addr[MAX_FB_BUFFER];
142   - void __iomem *vaddr[MAX_FB_BUFFER];
143 141 int zpos;
144 142  
145 143 bool default_win;
drivers/gpu/drm/exynos/exynos_drm_fimd.c
Diff comments   View file @ ddd8e95
... ... @@ -79,7 +79,6 @@
79 79 unsigned int fb_height;
80 80 unsigned int bpp;
81 81 dma_addr_t dma_addr;
82   - void __iomem *vaddr;
83 82 unsigned int buf_offsize;
84 83 unsigned int line_size; /* bytes */
85 84 bool enabled;
... ... @@ -375,7 +374,6 @@
375 374 win_data->fb_width = overlay->fb_width;
376 375 win_data->fb_height = overlay->fb_height;
377 376 win_data->dma_addr = overlay->dma_addr[0] + offset;
378   - win_data->vaddr = overlay->vaddr[0] + offset;
379 377 win_data->bpp = overlay->bpp;
380 378 win_data->buf_offsize = (overlay->fb_width - overlay->crtc_width) *
381 379 (overlay->bpp >> 3);
... ... @@ -385,9 +383,7 @@
385 383 win_data->offset_x, win_data->offset_y);
386 384 DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",
387 385 win_data->ovl_width, win_data->ovl_height);
388   - DRM_DEBUG_KMS("paddr = 0x%lx, vaddr = 0x%lx\n",
389   - (unsigned long)win_data->dma_addr,
390   - (unsigned long)win_data->vaddr);
  386 + DRM_DEBUG_KMS("paddr = 0x%lx\n", (unsigned long)win_data->dma_addr);
391 387 DRM_DEBUG_KMS("fb_width = %d, crtc_width = %d\n",
392 388 overlay->fb_width, overlay->crtc_width);
393 389 }
drivers/gpu/drm/exynos/exynos_drm_plane.c
Diff comments   View file @ ddd8e95
... ... @@ -93,11 +93,9 @@
93 93 }
94 94  
95 95 overlay->dma_addr[i] = buffer->dma_addr;
96   - overlay->vaddr[i] = buffer->kvaddr;
97 96  
98   - DRM_DEBUG_KMS("buffer: %d, vaddr = 0x%lx, dma_addr = 0x%lx\n",
99   - i, (unsigned long)overlay->vaddr[i],
100   - (unsigned long)overlay->dma_addr[i]);
  97 + DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",
  98 + i, (unsigned long)overlay->dma_addr[i]);
101 99 }
102 100  
103 101 actual_w = exynos_plane_get_size(crtc_x, crtc_w, crtc->mode.hdisplay);
drivers/gpu/drm/exynos/exynos_drm_vidi.c
Diff comments   View file @ ddd8e95
... ... @@ -39,7 +39,6 @@
39 39 unsigned int fb_height;
40 40 unsigned int bpp;
41 41 dma_addr_t dma_addr;
42   - void __iomem *vaddr;
43 42 unsigned int buf_offsize;
44 43 unsigned int line_size; /* bytes */
45 44 bool enabled;
... ... @@ -294,7 +293,6 @@
294 293 win_data->fb_width = overlay->fb_width;
295 294 win_data->fb_height = overlay->fb_height;
296 295 win_data->dma_addr = overlay->dma_addr[0] + offset;
297   - win_data->vaddr = overlay->vaddr[0] + offset;
298 296 win_data->bpp = overlay->bpp;
299 297 win_data->buf_offsize = (overlay->fb_width - overlay->crtc_width) *
300 298 (overlay->bpp >> 3);
... ... @@ -309,9 +307,7 @@
309 307 win_data->offset_x, win_data->offset_y);
310 308 DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",
311 309 win_data->ovl_width, win_data->ovl_height);
312   - DRM_DEBUG_KMS("paddr = 0x%lx, vaddr = 0x%lx\n",
313   - (unsigned long)win_data->dma_addr,
314   - (unsigned long)win_data->vaddr);
  310 + DRM_DEBUG_KMS("paddr = 0x%lx\n", (unsigned long)win_data->dma_addr);
315 311 DRM_DEBUG_KMS("fb_width = %d, crtc_width = %d\n",
316 312 overlay->fb_width, overlay->crtc_width);
317 313 }
drivers/gpu/drm/exynos/exynos_mixer.c
Diff comments   View file @ ddd8e95
... ... @@ -42,9 +42,7 @@
42 42  
43 43 struct hdmi_win_data {
44 44 dma_addr_t dma_addr;
45   - void __iomem *vaddr;
46 45 dma_addr_t chroma_dma_addr;
47   - void __iomem *chroma_vaddr;
48 46 uint32_t pixel_format;
49 47 unsigned int bpp;
50 48 unsigned int crtc_x;
51 49  
... ... @@ -749,9 +747,7 @@
749 747 win_data = &mixer_ctx->win_data[win];
750 748  
751 749 win_data->dma_addr = overlay->dma_addr[0];
752   - win_data->vaddr = overlay->vaddr[0];
753 750 win_data->chroma_dma_addr = overlay->dma_addr[1];
754   - win_data->chroma_vaddr = overlay->vaddr[1];
755 751 win_data->pixel_format = overlay->pixel_format;
756 752 win_data->bpp = overlay->bpp;
757 753