projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel...
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
fsl-dcu
/
fsl_dcu_drm_plane.c
diff --git
a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 82be6b86a1686d20e6e46000b4bc5a2246cbddd4..51daaea40b4d882c714609d38a5ced2be8c94a0c 100644
(file)
--- a/
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@
-58,7
+58,8
@@
static void fsl_dcu_drm_plane_atomic_disable(struct drm_plane *plane,
struct drm_plane_state *old_state)
{
struct fsl_dcu_drm_device *fsl_dev = plane->dev->dev_private;
struct drm_plane_state *old_state)
{
struct fsl_dcu_drm_device *fsl_dev = plane->dev->dev_private;
- unsigned int index, value, ret;
+ unsigned int value;
+ int index, ret;
index = fsl_dcu_drm_plane_index(plane);
if (index < 0)
index = fsl_dcu_drm_plane_index(plane);
if (index < 0)
@@
-190,14
+191,12
@@
set_failed:
static void
fsl_dcu_drm_plane_cleanup_fb(struct drm_plane *plane,
static void
fsl_dcu_drm_plane_cleanup_fb(struct drm_plane *plane,
- struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
}
static int
fsl_dcu_drm_plane_prepare_fb(struct drm_plane *plane,
const struct drm_plane_state *new_state)
{
}
static int
fsl_dcu_drm_plane_prepare_fb(struct drm_plane *plane,
- struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
return 0;
const struct drm_plane_state *new_state)
{
return 0;
This page took
0.028306 seconds
and
5
git commands to generate.