Skip to content

Commit f056cb9

Browse files
committed
Merge tag 'drm-misc-next-fixes-2023-11-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next-fixes for v6.7-rc1: - dt binding fix for ssd132x - Initialize ssd130x crtc_state to NULL. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 2ba446f + 94565e9 commit f056cb9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Documentation/devicetree/bindings/display/solomon,ssd132x.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
- enum:
15-
- solomon,ssd1322
16-
- solomon,ssd1325
17-
- solomon,ssd1327
14+
enum:
15+
- solomon,ssd1322
16+
- solomon,ssd1325
17+
- solomon,ssd1327
1818

1919
required:
2020
- compatible

drivers/gpu/drm/solomon/ssd130x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ static int ssd132x_primary_plane_atomic_check(struct drm_plane *plane,
910910
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
911911
struct ssd130x_plane_state *ssd130x_state = to_ssd130x_plane_state(plane_state);
912912
struct drm_crtc *crtc = plane_state->crtc;
913-
struct drm_crtc_state *crtc_state;
913+
struct drm_crtc_state *crtc_state = NULL;
914914
const struct drm_format_info *fi;
915915
unsigned int pitch;
916916
int ret;

0 commit comments

Comments
 (0)