korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 08:35:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Don't depend on encoder->new_crtc in intel_hdmi_compute_config

Browse Source 
Move towards atomic by using the legacy modeset's drm_atomic_state
instead.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-03-20 16:18:11 +02:00 committed by Daniel Vetter
parent 84556d58ef
commit 77f06c8662
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -951,19 +951,30 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
return MODE_OK; return MODE_OK;
} }
static bool hdmi_12bpc_possible(struct intel_crtc *crtc) static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc_state->base.crtc->dev;
struct drm_atomic_state *state;
struct intel_encoder *encoder; struct intel_encoder *encoder;
struct drm_connector_state *connector_state;
int count = 0, count_hdmi = 0; int count = 0, count_hdmi = 0;
int i;
if (HAS_GMCH_DISPLAY(dev)) if (HAS_GMCH_DISPLAY(dev))
return false; return false;
for_each_intel_encoder(dev, encoder) { state = crtc_state->base.state;
if (encoder->new_crtc != crtc)
for (i = 0; i < state->num_connector; i++) {
if (!state->connectors[i])
continue; continue;
connector_state = state->connector_states[i];
if (connector_state->crtc != crtc_state->base.crtc)
continue;
encoder = to_intel_encoder(connector_state->best_encoder);
count_hdmi += encoder->type == INTEL_OUTPUT_HDMI; count_hdmi += encoder->type == INTEL_OUTPUT_HDMI;
count++; count++;
} }
@ -1020,7 +1031,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
*/ */
if (pipe_config->pipe_bpp > 8*3 && pipe_config->has_hdmi_sink && if (pipe_config->pipe_bpp > 8*3 && pipe_config->has_hdmi_sink &&
clock_12bpc <= portclock_limit && clock_12bpc <= portclock_limit &&
hdmi_12bpc_possible(encoder->new_crtc)) { hdmi_12bpc_possible(pipe_config)) {
DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n"); DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
desired_bpp = 12*3; desired_bpp = 12*3;