diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-01-01 23:50:43 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-01-01 23:50:43 +0000 |
| commit | 1006cf9c7d96bd2a56364d765f2043c41e1296b4 (patch) | |
| tree | 304c23397c2a46d1b20295d3cc3af9886e036721 /sys/dev | |
| parent | b43a66b0358cba24bb53584112ee672651b06b9a (diff) | |
drm/i915: Fix intel_atomic_setup_scalers() plane_state handling
From Ville Syrjala
7afe8109456d94d6cc9374da869b2d64852b8535 in linux-6.1.y/6.1.70
c3070f080f9ba18dea92eaa21730f7ab85b5c8f4 in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/display/skl_scaler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/display/skl_scaler.c b/sys/dev/pci/drm/i915/display/skl_scaler.c index 83a61efa843..0b74f91e865 100644 --- a/sys/dev/pci/drm/i915/display/skl_scaler.c +++ b/sys/dev/pci/drm/i915/display/skl_scaler.c @@ -493,7 +493,6 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, { struct drm_plane *plane = NULL; struct intel_plane *intel_plane; - struct intel_plane_state *plane_state = NULL; struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; struct drm_atomic_state *drm_state = crtc_state->uapi.state; @@ -525,6 +524,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, /* walkthrough scaler_users bits and start assigning scalers */ for (i = 0; i < sizeof(scaler_state->scaler_users) * 8; i++) { + struct intel_plane_state *plane_state = NULL; int *scaler_id; const char *name; int idx, ret; |