FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-05 00:41:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Don't use encoder->new_crtc in compute_baseline_pipe_bpp()

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>
[danvet: Keep the if (!connector) continue; separate so that it's
easier to eventually extract a for_each_connector_in_state iterator.
And because of the upcast it's also safer.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-03-20 16:18:09 +02:00 committed by Daniel Vetter
parent 0b90187939
commit 1486017fbf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/i915/intel_display.c
View File

@ -10319,8 +10319,9 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config) struct intel_crtc_state *pipe_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_atomic_state *state;
struct intel_connector *connector; struct intel_connector *connector;
int bpp; int bpp, i;
switch (fb->pixel_format) { switch (fb->pixel_format) {
case DRM_FORMAT_C8: case DRM_FORMAT_C8:
@ -10360,10 +10361,15 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,
pipe_config->pipe_bpp = bpp; pipe_config->pipe_bpp = bpp;
state = pipe_config->base.state;
/* Clamp display bpp to EDID value */ /* Clamp display bpp to EDID value */
for_each_intel_connector(dev, connector) { for (i = 0; i < state->num_connector; i++) {
if (!connector->new_encoder || if (!state->connectors[i])
connector->new_encoder->new_crtc != crtc) continue;
connector = to_intel_connector(state->connectors[i]);
if (state->connector_states[i]->crtc != &crtc->base)
continue; continue;
connected_sink_compute_bpp(connector, pipe_config); connected_sink_compute_bpp(connector, pipe_config);