diff options
author | Dave Airlie <airlied@redhat.com> | 2014-08-04 19:41:42 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-08-04 19:41:42 -0400 |
commit | 8bb652eb38e50ce4e8709fbfd9e73f9d11ac3ff6 (patch) | |
tree | 58d676d6fa3d701d4f43e3c9a5ec68e623f723c3 /drivers/gpu/drm/sti | |
parent | 96b1b9711031a1e95e3cf15d830802aed38479a6 (diff) |
drm/sti: fix warning in build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/sti')
-rw-r--r-- | drivers/gpu/drm/sti/sti_compositor.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/sti/sti_drm_crtc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c index 770a725efa20..390d93e9a06c 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c | |||
@@ -119,6 +119,8 @@ static int sti_compositor_bind(struct device *dev, struct device *master, | |||
119 | (1 << crtc) - 1, plane_type); | 119 | (1 << crtc) - 1, plane_type); |
120 | plane++; | 120 | plane++; |
121 | break; | 121 | break; |
122 | case STI_BCK: | ||
123 | break; | ||
122 | } | 124 | } |
123 | 125 | ||
124 | /* The first planes are reserved for primary planes*/ | 126 | /* The first planes are reserved for primary planes*/ |
diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index 6eba648cf7b3..d2ae0c0e13be 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c | |||
@@ -151,8 +151,6 @@ static int sti_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, | |||
151 | struct drm_framebuffer *old_fb) | 151 | struct drm_framebuffer *old_fb) |
152 | { | 152 | { |
153 | struct sti_mixer *mixer = to_sti_mixer(crtc); | 153 | struct sti_mixer *mixer = to_sti_mixer(crtc); |
154 | struct device *dev = mixer->dev; | ||
155 | struct sti_compositor *compo = dev_get_drvdata(dev); | ||
156 | struct sti_layer *layer; | 154 | struct sti_layer *layer; |
157 | unsigned int w, h; | 155 | unsigned int w, h; |
158 | int ret; | 156 | int ret; |