Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd8e959 authored by YoungJun Cho's avatar YoungJun Cho Committed by Inki Dae
Browse files

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: default avatarYoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
parent 4744ad24

drivers/gpu/drm/exynos/exynos_drm_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ struct exynos_drm_overlay_ops { 
 * @pixel_format: fourcc pixel format of this overlay

 * @dma_addr: array of bus(accessed by dma) address to the memory region

 *	      allocated for a overlay.

 * @vaddr: array of virtual memory addresss to this overlay.

 * @zpos: order of overlay layer(z position).

 * @default_win: a window to be enabled.

 * @color_key: color key on or off.
@@ -139,7 +138,6 @@ struct exynos_drm_overlay { 
	unsigned int pitch;

	uint32_t pixel_format;

	dma_addr_t dma_addr[MAX_FB_BUFFER];

	void __iomem *vaddr[MAX_FB_BUFFER];

	int zpos;



	bool default_win;

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct fimd_win_data { 
	unsigned int		fb_height;

	unsigned int		bpp;

	dma_addr_t		dma_addr;

	void __iomem		*vaddr;

	unsigned int		buf_offsize;

	unsigned int		line_size;	/* bytes */

	bool			enabled;
@@ -375,7 +374,6 @@ static void fimd_win_mode_set(struct device *dev, 
	win_data->fb_width = overlay->fb_width;

	win_data->fb_height = overlay->fb_height;

	win_data->dma_addr = overlay->dma_addr[0] + offset;

	win_data->vaddr = overlay->vaddr[0] + offset;

	win_data->bpp = overlay->bpp;

	win_data->buf_offsize = (overlay->fb_width - overlay->crtc_width) *

				(overlay->bpp >> 3);
@@ -385,9 +383,7 @@ static void fimd_win_mode_set(struct device *dev, 
			win_data->offset_x, win_data->offset_y);

	DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",

			win_data->ovl_width, win_data->ovl_height);

	DRM_DEBUG_KMS("paddr = 0x%lx, vaddr = 0x%lx\n",

			(unsigned long)win_data->dma_addr,

			(unsigned long)win_data->vaddr);

	DRM_DEBUG_KMS("paddr = 0x%lx\n", (unsigned long)win_data->dma_addr);

	DRM_DEBUG_KMS("fb_width = %d, crtc_width = %d\n",

			overlay->fb_width, overlay->crtc_width);

}

drivers/gpu/drm/exynos/exynos_drm_plane.c

+2 −4
Original line number Diff line number Diff line
@@ -93,11 +93,9 @@ int exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, 
		}



		overlay->dma_addr[i] = buffer->dma_addr;

		overlay->vaddr[i] = buffer->kvaddr;



		DRM_DEBUG_KMS("buffer: %d, vaddr = 0x%lx, dma_addr = 0x%lx\n",

				i, (unsigned long)overlay->vaddr[i],

				(unsigned long)overlay->dma_addr[i]);

		DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",

				i, (unsigned long)overlay->dma_addr[i]);

	}



	actual_w = exynos_plane_get_size(crtc_x, crtc_w, crtc->mode.hdisplay);

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+1 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ struct vidi_win_data { 
	unsigned int		fb_height;

	unsigned int		bpp;

	dma_addr_t		dma_addr;

	void __iomem		*vaddr;

	unsigned int		buf_offsize;

	unsigned int		line_size;	/* bytes */

	bool			enabled;
@@ -294,7 +293,6 @@ static void vidi_win_mode_set(struct device *dev, 
	win_data->fb_width = overlay->fb_width;

	win_data->fb_height = overlay->fb_height;

	win_data->dma_addr = overlay->dma_addr[0] + offset;

	win_data->vaddr = overlay->vaddr[0] + offset;

	win_data->bpp = overlay->bpp;

	win_data->buf_offsize = (overlay->fb_width - overlay->crtc_width) *

				(overlay->bpp >> 3);
@@ -309,9 +307,7 @@ static void vidi_win_mode_set(struct device *dev, 
			win_data->offset_x, win_data->offset_y);

	DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",

			win_data->ovl_width, win_data->ovl_height);

	DRM_DEBUG_KMS("paddr = 0x%lx, vaddr = 0x%lx\n",

			(unsigned long)win_data->dma_addr,

			(unsigned long)win_data->vaddr);

	DRM_DEBUG_KMS("paddr = 0x%lx\n", (unsigned long)win_data->dma_addr);

	DRM_DEBUG_KMS("fb_width = %d, crtc_width = %d\n",

			overlay->fb_width, overlay->crtc_width);

}

drivers/gpu/drm/exynos/exynos_mixer.c

+0 −4
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ 


struct hdmi_win_data {

	dma_addr_t		dma_addr;

	void __iomem		*vaddr;

	dma_addr_t		chroma_dma_addr;

	void __iomem		*chroma_vaddr;

	uint32_t		pixel_format;

	unsigned int		bpp;

	unsigned int		crtc_x;
@@ -749,9 +747,7 @@ static void mixer_win_mode_set(void *ctx, 
	win_data = &mixer_ctx->win_data[win];



	win_data->dma_addr = overlay->dma_addr[0];

	win_data->vaddr = overlay->vaddr[0];

	win_data->chroma_dma_addr = overlay->dma_addr[1];

	win_data->chroma_vaddr = overlay->vaddr[1];

	win_data->pixel_format = overlay->pixel_format;

	win_data->bpp = overlay->bpp;