mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
drm/gma500: Make use of gma_pipe_has_type()
Replace any use of xxx_intel_pipe_has_type() with the generic gma_pipe_has_type() function. Poulsbo still use it but that will be removed when we rip out psb_intel_pipe_has_type(). Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
parent
2adb29ff61
commit
fe477cc1b0
3 changed files with 11 additions and 11 deletions
|
@ -26,7 +26,7 @@
|
|||
#include "psb_drv.h"
|
||||
#include "psb_intel_drv.h"
|
||||
#include "psb_intel_reg.h"
|
||||
#include "psb_intel_display.h"
|
||||
#include "gma_display.h"
|
||||
#include "power.h"
|
||||
#include "cdv_device.h"
|
||||
|
||||
|
@ -375,7 +375,7 @@ static const struct gma_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
|
|||
int refclk)
|
||||
{
|
||||
const struct gma_limit_t *limit;
|
||||
if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
|
||||
if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
|
||||
/*
|
||||
* Now only single-channel LVDS is supported on CDV. If it is
|
||||
* incorrect, please add the dual-channel LVDS.
|
||||
|
@ -384,8 +384,8 @@ static const struct gma_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
|
|||
limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_96];
|
||||
else
|
||||
limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_100];
|
||||
} else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
|
||||
psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
|
||||
} else if (gma_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
|
||||
gma_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
|
||||
if (refclk == 27000)
|
||||
limit = &cdv_intel_limits[CDV_LIMIT_DP_27];
|
||||
else
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <drm/drmP.h>
|
||||
#include "psb_intel_reg.h"
|
||||
#include "psb_intel_display.h"
|
||||
#include "gma_display.h"
|
||||
#include "framebuffer.h"
|
||||
#include "mdfld_output.h"
|
||||
#include "mdfld_dsi_output.h"
|
||||
|
@ -611,8 +611,8 @@ static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc)
|
|||
struct drm_device *dev = crtc->dev;
|
||||
struct drm_psb_private *dev_priv = dev->dev_private;
|
||||
|
||||
if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)
|
||||
|| psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI2)) {
|
||||
if (gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)
|
||||
|| gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI2)) {
|
||||
if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
|
||||
limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_19];
|
||||
else if (ksel == KSEL_BYPASS_25)
|
||||
|
@ -624,7 +624,7 @@ static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc)
|
|||
(dev_priv->core_freq == 100 ||
|
||||
dev_priv->core_freq == 200))
|
||||
limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_100];
|
||||
} else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
|
||||
} else if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
|
||||
if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
|
||||
limit = &mdfld_limits[MDFLD_LIMT_DPLL_19];
|
||||
else if (ksel == KSEL_BYPASS_25)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "psb_drv.h"
|
||||
#include "psb_intel_drv.h"
|
||||
#include "psb_intel_reg.h"
|
||||
#include "psb_intel_display.h"
|
||||
#include "gma_display.h"
|
||||
#include "power.h"
|
||||
|
||||
struct psb_intel_range_t {
|
||||
|
@ -88,8 +88,8 @@ static const struct oaktrail_limit_t *oaktrail_limit(struct drm_crtc *crtc)
|
|||
struct drm_device *dev = crtc->dev;
|
||||
struct drm_psb_private *dev_priv = dev->dev_private;
|
||||
|
||||
if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
|
||||
|| psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {
|
||||
if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
|
||||
|| gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {
|
||||
switch (dev_priv->core_freq) {
|
||||
case 100:
|
||||
limit = &oaktrail_limits[MRST_LIMIT_LVDS_100L];
|
||||
|
|
Loading…
Reference in a new issue