Skip to content

Commit

Permalink
drivers/video: fsl-diu-fb: add support for set_gamma ioctls
Browse files Browse the repository at this point in the history
The MPC5121 BSP comes with a gamma_set utility that initializes the gamma
table via an ioctl.  Unfortunately, the ioctl number that utility uses
is defined improperly, but we can still support it.

Signed-off-by: Timur Tabi <timur@freescale.com>
  • Loading branch information
Timur Tabi committed Nov 26, 2012
1 parent 2867173 commit e95c17e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
17 changes: 17 additions & 0 deletions drivers/video/fsl-diu-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,23 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
ad->ckmin_b = ck.blue_min;
}
break;
#ifdef CONFIG_PPC_MPC512x
case MFB_SET_GAMMA: {
struct fsl_diu_data *data = mfbi->parent;

if (copy_from_user(data->gamma, buf, sizeof(data->gamma)))
return -EFAULT;
setbits32(&data->diu_reg->gamma, 0); /* Force table reload */
break;
}
case MFB_GET_GAMMA: {
struct fsl_diu_data *data = mfbi->parent;

if (copy_to_user(buf, data->gamma, sizeof(data->gamma)))
return -EFAULT;
break;
}
#endif
default:
dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd);
return -ENOIOCTLCMD;
Expand Down
9 changes: 9 additions & 0 deletions include/linux/fsl-diu-fb.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ struct aoi_display_offset {
#define MFB_SET_PIXFMT _IOW('M', 8, __u32)
#define MFB_GET_PIXFMT _IOR('M', 8, __u32)

/*
* The MPC5121 BSP comes with a gamma_set utility that initializes the
* gamma table. Unfortunately, it uses bad values for the IOCTL commands,
* but there's nothing we can do about it now. These ioctls are only
* supported on the MPC5121.
*/
#define MFB_SET_GAMMA _IOW('M', 1, __u8)
#define MFB_GET_GAMMA _IOR('M', 1, __u8)

/*
* The original definitions of MFB_SET_PIXFMT and MFB_GET_PIXFMT used the
* wrong value for 'size' field of the ioctl. The current macros above use the
Expand Down

0 comments on commit e95c17e

Please sign in to comment.