mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
drm/i915: Relocate a few more pch transcoder bits
Move intel_crtc_pch_transcoder() and has_pch_trancoder() to a more appropritate place (intel_pch_display.c). Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220221110356.5532-4-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
108a112f5e
commit
a97087026d
5 changed files with 26 additions and 19 deletions
|
@ -519,16 +519,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
|
|||
expected_mask);
|
||||
}
|
||||
|
||||
enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
||||
|
||||
if (HAS_PCH_LPT(dev_priv))
|
||||
return PIPE_A;
|
||||
else
|
||||
return crtc->pipe;
|
||||
}
|
||||
|
||||
void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)
|
||||
{
|
||||
struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
|
||||
|
@ -9928,13 +9918,6 @@ static struct intel_connector *intel_encoder_find_connector(struct intel_encoder
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static bool has_pch_trancoder(struct drm_i915_private *dev_priv,
|
||||
enum pipe pch_transcoder)
|
||||
{
|
||||
return HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv) ||
|
||||
(HAS_PCH_LPT_H(dev_priv) && pch_transcoder == PIPE_A);
|
||||
}
|
||||
|
||||
static void intel_sanitize_crtc(struct intel_crtc *crtc,
|
||||
struct drm_modeset_acquire_ctx *ctx)
|
||||
{
|
||||
|
@ -9989,7 +9972,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
|
|||
* PCH transcoders B and C would prevent enabling the south
|
||||
* error interrupt (see cpt_can_enable_serr_int()).
|
||||
*/
|
||||
if (has_pch_trancoder(dev_priv, crtc->pipe))
|
||||
if (intel_has_pch_trancoder(dev_priv, crtc->pipe))
|
||||
crtc->pch_fifo_underrun_disabled = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -565,7 +565,6 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);
|
|||
void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state);
|
||||
void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
|
||||
void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
|
||||
enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc);
|
||||
int vlv_get_hpll_vco(struct drm_i915_private *dev_priv);
|
||||
int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
|
||||
const char *name, u32 reg, int ref_freq);
|
||||
|
|
|
@ -68,6 +68,7 @@
|
|||
#include "intel_lspcon.h"
|
||||
#include "intel_lvds.h"
|
||||
#include "intel_panel.h"
|
||||
#include "intel_pch_display.h"
|
||||
#include "intel_pps.h"
|
||||
#include "intel_psr.h"
|
||||
#include "intel_tc.h"
|
||||
|
|
|
@ -14,6 +14,23 @@
|
|||
#include "intel_pps.h"
|
||||
#include "intel_sdvo.h"
|
||||
|
||||
bool intel_has_pch_trancoder(struct drm_i915_private *i915,
|
||||
enum pipe pch_transcoder)
|
||||
{
|
||||
return HAS_PCH_IBX(i915) || HAS_PCH_CPT(i915) ||
|
||||
(HAS_PCH_LPT_H(i915) && pch_transcoder == PIPE_A);
|
||||
}
|
||||
|
||||
enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)
|
||||
{
|
||||
struct drm_i915_private *i915 = to_i915(crtc->base.dev);
|
||||
|
||||
if (HAS_PCH_LPT(i915))
|
||||
return PIPE_A;
|
||||
else
|
||||
return crtc->pipe;
|
||||
}
|
||||
|
||||
static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv,
|
||||
enum pipe pipe, enum port port,
|
||||
i915_reg_t dp_reg)
|
||||
|
|
|
@ -6,12 +6,19 @@
|
|||
#ifndef _INTEL_PCH_DISPLAY_H_
|
||||
#define _INTEL_PCH_DISPLAY_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
enum pipe;
|
||||
struct drm_i915_private;
|
||||
struct intel_atomic_state;
|
||||
struct intel_crtc;
|
||||
struct intel_crtc_state;
|
||||
struct intel_link_m_n;
|
||||
|
||||
bool intel_has_pch_trancoder(struct drm_i915_private *i915,
|
||||
enum pipe pch_transcoder);
|
||||
enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc);
|
||||
|
||||
void ilk_pch_pre_enable(struct intel_atomic_state *state,
|
||||
struct intel_crtc *crtc);
|
||||
void ilk_pch_enable(struct intel_atomic_state *state,
|
||||
|
|
Loading…
Reference in a new issue