drm: Drop all the stub gamma_get, gamma_set, load_lut functions from drivers
Many of the drivers didn't implement palette/gamma handling, but were forced to provide stubs for the hooks to avoid drm_fb_helper from oopsing. Now that the hooks are optional, we can eliminate all the stubs. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@gmail.com>
This commit is contained in:
Родитель
04c0c569d4
Коммит
fb85ac4da8
|
@ -169,12 +169,6 @@ static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
DRM_DEBUG_KMS("%s\n", __FILE__);
|
||||
/* drm framework doesn't check NULL */
|
||||
}
|
||||
|
||||
static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
|
||||
{
|
||||
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
|
||||
|
@ -192,7 +186,6 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
|
|||
.mode_fixup = exynos_drm_crtc_mode_fixup,
|
||||
.mode_set = exynos_drm_crtc_mode_set,
|
||||
.mode_set_base = exynos_drm_crtc_mode_set_base,
|
||||
.load_lut = exynos_drm_crtc_load_lut,
|
||||
.disable = exynos_drm_crtc_disable,
|
||||
};
|
||||
|
||||
|
|
|
@ -253,10 +253,6 @@ static int omap_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
|
|||
NULL, NULL);
|
||||
}
|
||||
|
||||
static void omap_crtc_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
}
|
||||
|
||||
static void vblank_cb(void *arg)
|
||||
{
|
||||
struct drm_crtc *crtc = arg;
|
||||
|
@ -366,7 +362,6 @@ static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = {
|
|||
.prepare = omap_crtc_prepare,
|
||||
.commit = omap_crtc_commit,
|
||||
.mode_set_base = omap_crtc_mode_set_base,
|
||||
.load_lut = omap_crtc_load_lut,
|
||||
};
|
||||
|
||||
const struct omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc)
|
||||
|
|
|
@ -281,21 +281,7 @@ fail:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void omap_crtc_fb_gamma_set(struct drm_crtc *crtc,
|
||||
u16 red, u16 green, u16 blue, int regno)
|
||||
{
|
||||
DBG("fbdev: set gamma");
|
||||
}
|
||||
|
||||
static void omap_crtc_fb_gamma_get(struct drm_crtc *crtc,
|
||||
u16 *red, u16 *green, u16 *blue, int regno)
|
||||
{
|
||||
DBG("fbdev: get gamma");
|
||||
}
|
||||
|
||||
static struct drm_fb_helper_funcs omap_fb_helper_funcs = {
|
||||
.gamma_set = omap_crtc_fb_gamma_set,
|
||||
.gamma_get = omap_crtc_fb_gamma_get,
|
||||
.fb_probe = omap_fbdev_create,
|
||||
};
|
||||
|
||||
|
|
|
@ -222,12 +222,6 @@ static int qxl_add_common_modes(struct drm_connector *connector)
|
|||
return i - 1;
|
||||
}
|
||||
|
||||
static void qxl_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
|
||||
u16 *blue, uint32_t start, uint32_t size)
|
||||
{
|
||||
/* TODO */
|
||||
}
|
||||
|
||||
static void qxl_crtc_destroy(struct drm_crtc *crtc)
|
||||
{
|
||||
struct qxl_crtc *qxl_crtc = to_qxl_crtc(crtc);
|
||||
|
@ -399,7 +393,6 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
|
|||
static const struct drm_crtc_funcs qxl_crtc_funcs = {
|
||||
.cursor_set = qxl_crtc_cursor_set,
|
||||
.cursor_move = qxl_crtc_cursor_move,
|
||||
.gamma_set = qxl_crtc_gamma_set,
|
||||
.set_config = drm_crtc_helper_set_config,
|
||||
.destroy = qxl_crtc_destroy,
|
||||
};
|
||||
|
@ -619,18 +612,12 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
|
|||
DRM_DEBUG("\n");
|
||||
}
|
||||
|
||||
static void qxl_crtc_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
DRM_DEBUG("\n");
|
||||
}
|
||||
|
||||
static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = {
|
||||
.dpms = qxl_crtc_dpms,
|
||||
.mode_fixup = qxl_crtc_mode_fixup,
|
||||
.mode_set = qxl_crtc_mode_set,
|
||||
.prepare = qxl_crtc_prepare,
|
||||
.commit = qxl_crtc_commit,
|
||||
.load_lut = qxl_crtc_load_lut,
|
||||
};
|
||||
|
||||
static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
|
||||
|
|
|
@ -520,10 +520,6 @@ static int qxl_fbdev_destroy(struct drm_device *dev, struct qxl_fbdev *qfbdev)
|
|||
}
|
||||
|
||||
static struct drm_fb_helper_funcs qxl_fb_helper_funcs = {
|
||||
/* TODO
|
||||
.gamma_set = qxl_crtc_fb_gamma_set,
|
||||
.gamma_get = qxl_crtc_fb_gamma_get,
|
||||
*/
|
||||
.fb_probe = qxl_fb_find_or_create_single,
|
||||
};
|
||||
|
||||
|
|
|
@ -384,10 +384,6 @@ static int tilcdc_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void tilcdc_crtc_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
}
|
||||
|
||||
static const struct drm_crtc_funcs tilcdc_crtc_funcs = {
|
||||
.destroy = tilcdc_crtc_destroy,
|
||||
.set_config = drm_crtc_helper_set_config,
|
||||
|
@ -401,7 +397,6 @@ static const struct drm_crtc_helper_funcs tilcdc_crtc_helper_funcs = {
|
|||
.commit = tilcdc_crtc_commit,
|
||||
.mode_set = tilcdc_crtc_mode_set,
|
||||
.mode_set_base = tilcdc_crtc_mode_set_base,
|
||||
.load_lut = tilcdc_crtc_load_lut,
|
||||
};
|
||||
|
||||
int tilcdc_crtc_max_width(struct drm_crtc *crtc)
|
||||
|
|
|
@ -393,19 +393,6 @@ static struct fb_ops udlfb_ops = {
|
|||
.fb_release = udl_fb_release,
|
||||
};
|
||||
|
||||
static void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
|
||||
u16 blue, int regno)
|
||||
{
|
||||
}
|
||||
|
||||
static void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
|
||||
u16 *blue, int regno)
|
||||
{
|
||||
*red = 0;
|
||||
*green = 0;
|
||||
*blue = 0;
|
||||
}
|
||||
|
||||
static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
|
||||
struct drm_file *file,
|
||||
unsigned flags, unsigned color,
|
||||
|
@ -558,8 +545,6 @@ out:
|
|||
}
|
||||
|
||||
static struct drm_fb_helper_funcs udl_fb_helper_funcs = {
|
||||
.gamma_set = udl_crtc_fb_gamma_set,
|
||||
.gamma_get = udl_crtc_fb_gamma_get,
|
||||
.fb_probe = udlfb_create,
|
||||
};
|
||||
|
||||
|
|
|
@ -363,10 +363,6 @@ static void udl_crtc_destroy(struct drm_crtc *crtc)
|
|||
kfree(crtc);
|
||||
}
|
||||
|
||||
static void udl_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
}
|
||||
|
||||
static void udl_crtc_prepare(struct drm_crtc *crtc)
|
||||
{
|
||||
}
|
||||
|
@ -383,7 +379,6 @@ static struct drm_crtc_helper_funcs udl_helper_funcs = {
|
|||
.prepare = udl_crtc_prepare,
|
||||
.commit = udl_crtc_commit,
|
||||
.disable = udl_crtc_disable,
|
||||
.load_lut = udl_load_lut,
|
||||
};
|
||||
|
||||
static const struct drm_crtc_funcs udl_crtc_funcs = {
|
||||
|
|
|
@ -364,17 +364,12 @@ static void ipu_crtc_commit(struct drm_crtc *crtc)
|
|||
ipu_fb_enable(ipu_crtc);
|
||||
}
|
||||
|
||||
static void ipu_crtc_load_lut(struct drm_crtc *crtc)
|
||||
{
|
||||
}
|
||||
|
||||
static struct drm_crtc_helper_funcs ipu_helper_funcs = {
|
||||
.dpms = ipu_crtc_dpms,
|
||||
.mode_fixup = ipu_crtc_mode_fixup,
|
||||
.mode_set = ipu_crtc_mode_set,
|
||||
.prepare = ipu_crtc_prepare,
|
||||
.commit = ipu_crtc_commit,
|
||||
.load_lut = ipu_crtc_load_lut,
|
||||
};
|
||||
|
||||
static int ipu_enable_vblank(struct drm_crtc *crtc)
|
||||
|
|
Загрузка…
Ссылка в новой задаче