hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm: rcar-du: Remove unneeded rcar_du_crtc plane field 

The rcar_du_crtc plane field is only used to check for an error that
can't occur. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2015-02-23 03:20:39 +02:00
parent 47094194f0
commit 53dff60179
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
View File

@ -353,9 +353,6 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
if (rcrtc->started) if (rcrtc->started)
return; return;
if (WARN_ON(rcrtc->plane->format == NULL))
return;
/* Set display off and background to black */ /* Set display off and background to black */
rcar_du_crtc_write(rcrtc, DOOR, DOOR_RGB(0, 0, 0)); rcar_du_crtc_write(rcrtc, DOOR, DOOR_RGB(0, 0, 0));
rcar_du_crtc_write(rcrtc, BPOR, BPOR_RGB(0, 0, 0)); rcar_du_crtc_write(rcrtc, BPOR, BPOR_RGB(0, 0, 0));
@ -606,9 +603,9 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
rcrtc->mmio_offset = mmio_offsets[index]; rcrtc->mmio_offset = mmio_offsets[index];
rcrtc->index = index; rcrtc->index = index;
rcrtc->enabled = false; rcrtc->enabled = false;
rcrtc->plane = &rgrp->planes.planes[index % 2];
ret = drm_crtc_init_with_planes(rcdu->ddev, crtc, &rcrtc->plane->plane, ret = drm_crtc_init_with_planes(rcdu->ddev, crtc,
&rgrp->planes.planes[index % 2].plane,
NULL, &crtc_funcs); NULL, &crtc_funcs);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
drivers/gpu/drm/rcar-du/rcar_du_crtc.h
View File

@ -21,7 +21,6 @@
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
struct rcar_du_group; struct rcar_du_group;
struct rcar_du_plane;
struct rcar_du_crtc { struct rcar_du_crtc {
struct drm_crtc crtc; struct drm_crtc crtc;
@ -39,7 +38,6 @@ struct rcar_du_crtc {
bool enabled; bool enabled;
struct rcar_du_group *group; struct rcar_du_group *group;
struct rcar_du_plane *plane;
}; };
#define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc) #define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc)