Merge branch 'for-3.2-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus
This commit is contained in:
commit
50084842cc
3 changed files with 7 additions and 7 deletions
|
@ -19,6 +19,7 @@
|
||||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
|
|
|
@ -1720,12 +1720,11 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
|
||||||
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
|
const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
|
||||||
unsigned long fclk = 0;
|
unsigned long fclk = 0;
|
||||||
|
|
||||||
if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
|
if (width == out_width && height == out_height)
|
||||||
if (width != out_width || height != out_height)
|
return 0;
|
||||||
return -EINVAL;
|
|
||||||
else
|
if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0)
|
||||||
return 0;
|
return -EINVAL;
|
||||||
}
|
|
||||||
|
|
||||||
if (out_width < width / maxdownscale ||
|
if (out_width < width / maxdownscale ||
|
||||||
out_width > width * 8)
|
out_width > width * 8)
|
||||||
|
|
|
@ -269,7 +269,7 @@ static void update_hdmi_timings(struct hdmi_config *cfg,
|
||||||
unsigned long hdmi_get_pixel_clock(void)
|
unsigned long hdmi_get_pixel_clock(void)
|
||||||
{
|
{
|
||||||
/* HDMI Pixel Clock in Mhz */
|
/* HDMI Pixel Clock in Mhz */
|
||||||
return hdmi.ip_data.cfg.timings.timings.pixel_clock * 10000;
|
return hdmi.ip_data.cfg.timings.timings.pixel_clock * 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
|
static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy,
|
||||||
|
|
Reference in a new issue