fbdev changes for 4.2
* ssd1307fb: various fixes and improvements, SSD1305 support * Use architecture agnostic functions instead of MTRR functions in various fbdev drivers * TI DRA7xx SoC display support (arch/arm/ side) * OMAPDSS componentization to fix probing order issues * OMAPDSS scaling fixes * msm_fb: remove obsoleted driver -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJViP8kAAoJEPo9qoy8lh71RqQP/3YnFrHQj1G/EDw4EvaUrcJb MiEbc6Q1/OkG+KWls8kNFi0Mm5PeXlOYgjYukr9mFS0C/BxceU/Aqg/+1TqGSMe4 kZArCTKWa3ZyU2TUwmPPpeUPeUTUBBXrVBdfqtfNzs2wQKunwQX9MlKQnDHnCZJD 4kUsK12iW5C+EW0fDWDEg9GwEe/cJ6jBLEYWPTg/1ePtrKKGp8O6kEEtOTVwaKT+ EdStaPOTUKvCgdcfVQhIgKcym2t4/BeFEt2moxDU9vwClatGbXmTDIru2iCrGgIU VFGIjOetVwRe0h+8zpYTATxvJPxmjWYL7HhJ0SbFNMDlZephdJxZGJbgszxHZCW/ ap1fnxWvW2LZ48JsZSmHTnWK0CoX3WGs+Q+TWqMHy1ID8jkOc2SkHeB3IzCyOG/V NwUNvDyooyNV0J8ywbBXIMVmlg7YE3AgNROFlApqm2rF5fhtTO3HER71ALBZckEH FXRN4tsyLQXbzmuHcQgY3ENxPZgPYM0usSdAVWSU/vIXrhdnWGA7nWE7bRg508Hd aHhpw5HrH8L+4nNwDvd4Dai9Ye8DimWvIPdb1wH8mZ2c81sLxCTkePqkAc7AXo54 UOkXSWjUBu1i8w/BZqXT9U/dU+aCDQ9beNDFLrZQLwrwtHASyyJY75Hi3DtcZyBQ HUAWB45Gu2f+k7PCGsRQ =Ix8O -----END PGP SIGNATURE----- Merge tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux Pull fbdev updates from Tomi Valkeinen: - ssd1307fb: various fixes and improvements, SSD1305 support - use architecture agnostic functions instead of MTRR functions in various fbdev drivers - TI DRA7xx SoC display support (arch/arm/ side) - OMAPDSS componentization to fix probing order issues - OMAPDSS scaling fixes - msm_fb: remove obsoleted driver * tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits) msm: msm_fb: Remove dead code OMAPDSS: HDMI: wait for framedone when stopping video OMAPDSS: HDMI4: fix error handling OMAPDSS: DISPC: scaler debug print OMAPDSS: DISPC: do only y decimation on OMAP3 OMAPDSS: DISPC: check if scaling setup failed OMAPDSS: DISPC: fix 64 bit issue in 5-tap OMAPDSS: DISPC: fix row_inc for OMAP3 OMAPDSS: DISPC: add check for scaling limits OMAPDSS: DISPC: fix check_horiz_timing_omap3 args OMAPDSS: DISPC: fix predecimation for YUV modes OMAPDSS: DISPC: work-around for errata i631 OMAPDSS: simplify submodule reg/unreg code OMAPDSS: componentize omapdss OMAPDSS: reorder uninit calls OMAPDSS: remove uses of __init/__exit OMAPDSS: fix dss_init_ports error handling OMAPDSS: refactor dss probe function OMAPDSS: move 'dss_initialized' to dss driver fbdev: propagate result of fb_videomode_from_videomode() ...
This commit is contained in:
Linus Torvalds
commit
1a13e36a79
85 changed files with 1325 additions and 6694 deletions
|
|
@ -1,146 +0,0 @@
|
|||
/*
|
||||
* Internal shared definitions for various MSM framebuffer parts.
|
||||
*
|
||||
* Copyright (C) 2007 Google Incorporated
|
||||
*
|
||||
* This software is licensed under the terms of the GNU General Public
|
||||
* License version 2, as published by the Free Software Foundation, and
|
||||
* may be copied, distributed, and modified under those terms.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef _MSM_FB_H_
|
||||
#define _MSM_FB_H_
|
||||
|
||||
#include <linux/device.h>
|
||||
|
||||
struct mddi_info;
|
||||
|
||||
struct msm_fb_data {
|
||||
int xres; /* x resolution in pixels */
|
||||
int yres; /* y resolution in pixels */
|
||||
int width; /* disply width in mm */
|
||||
int height; /* display height in mm */
|
||||
unsigned output_format;
|
||||
};
|
||||
|
||||
struct msmfb_callback {
|
||||
void (*func)(struct msmfb_callback *);
|
||||
};
|
||||
|
||||
enum {
|
||||
MSM_MDDI_PMDH_INTERFACE,
|
||||
MSM_MDDI_EMDH_INTERFACE,
|
||||
MSM_EBI2_INTERFACE,
|
||||
};
|
||||
|
||||
#define MSMFB_CAP_PARTIAL_UPDATES (1 << 0)
|
||||
|
||||
struct msm_panel_data {
|
||||
/* turns off the fb memory */
|
||||
int (*suspend)(struct msm_panel_data *);
|
||||
/* turns on the fb memory */
|
||||
int (*resume)(struct msm_panel_data *);
|
||||
/* turns off the panel */
|
||||
int (*blank)(struct msm_panel_data *);
|
||||
/* turns on the panel */
|
||||
int (*unblank)(struct msm_panel_data *);
|
||||
void (*wait_vsync)(struct msm_panel_data *);
|
||||
void (*request_vsync)(struct msm_panel_data *, struct msmfb_callback *);
|
||||
void (*clear_vsync)(struct msm_panel_data *);
|
||||
/* from the enum above */
|
||||
unsigned interface_type;
|
||||
/* data to be passed to the fb driver */
|
||||
struct msm_fb_data *fb_data;
|
||||
|
||||
/* capabilities supported by the panel */
|
||||
uint32_t caps;
|
||||
};
|
||||
|
||||
struct msm_mddi_client_data {
|
||||
void (*suspend)(struct msm_mddi_client_data *);
|
||||
void (*resume)(struct msm_mddi_client_data *);
|
||||
void (*activate_link)(struct msm_mddi_client_data *);
|
||||
void (*remote_write)(struct msm_mddi_client_data *, uint32_t val,
|
||||
uint32_t reg);
|
||||
uint32_t (*remote_read)(struct msm_mddi_client_data *, uint32_t reg);
|
||||
void (*auto_hibernate)(struct msm_mddi_client_data *, int);
|
||||
/* custom data that needs to be passed from the board file to a
|
||||
* particular client */
|
||||
void *private_client_data;
|
||||
struct resource *fb_resource;
|
||||
/* from the list above */
|
||||
unsigned interface_type;
|
||||
};
|
||||
|
||||
struct msm_mddi_platform_data {
|
||||
unsigned int clk_rate;
|
||||
void (*power_client)(struct msm_mddi_client_data *, int on);
|
||||
|
||||
/* fixup the mfr name, product id */
|
||||
void (*fixup)(uint16_t *mfr_name, uint16_t *product_id);
|
||||
|
||||
struct resource *fb_resource; /*optional*/
|
||||
/* number of clients in the list that follows */
|
||||
int num_clients;
|
||||
/* array of client information of clients */
|
||||
struct {
|
||||
unsigned product_id; /* mfr id in top 16 bits, product id
|
||||
* in lower 16 bits
|
||||
*/
|
||||
char *name; /* the device name will be the platform
|
||||
* device name registered for the client,
|
||||
* it should match the name of the associated
|
||||
* driver
|
||||
*/
|
||||
unsigned id; /* id for mddi client device node, will also
|
||||
* be used as device id of panel devices, if
|
||||
* the client device will have multiple panels
|
||||
* space must be left here for them
|
||||
*/
|
||||
void *client_data; /* required private client data */
|
||||
unsigned int clk_rate; /* optional: if the client requires a
|
||||
* different mddi clk rate
|
||||
*/
|
||||
} client_platform_data[];
|
||||
};
|
||||
|
||||
struct mdp_blit_req;
|
||||
struct fb_info;
|
||||
struct mdp_device {
|
||||
struct device dev;
|
||||
void (*dma)(struct mdp_device *mpd, uint32_t addr,
|
||||
uint32_t stride, uint32_t w, uint32_t h, uint32_t x,
|
||||
uint32_t y, struct msmfb_callback *callback, int interface);
|
||||
void (*dma_wait)(struct mdp_device *mdp);
|
||||
int (*blit)(struct mdp_device *mdp, struct fb_info *fb,
|
||||
struct mdp_blit_req *req);
|
||||
void (*set_grp_disp)(struct mdp_device *mdp, uint32_t disp_id);
|
||||
};
|
||||
|
||||
struct class_interface;
|
||||
int register_mdp_client(struct class_interface *class_intf);
|
||||
|
||||
/**** private client data structs go below this line ***/
|
||||
|
||||
struct msm_mddi_bridge_platform_data {
|
||||
/* from board file */
|
||||
int (*init)(struct msm_mddi_bridge_platform_data *,
|
||||
struct msm_mddi_client_data *);
|
||||
int (*uninit)(struct msm_mddi_bridge_platform_data *,
|
||||
struct msm_mddi_client_data *);
|
||||
/* passed to panel for use by the fb driver */
|
||||
int (*blank)(struct msm_mddi_bridge_platform_data *,
|
||||
struct msm_mddi_client_data *);
|
||||
int (*unblank)(struct msm_mddi_bridge_platform_data *,
|
||||
struct msm_mddi_client_data *);
|
||||
struct msm_fb_data fb_data;
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue