Commit f056cb96 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2023-11-02' of... 

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: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/58f40043-bb8a-4716-bf07-89f6a9f56c4c@linux.intel.com
parents 2ba446f8 94565e95

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

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ maintainers: 


properties:

  compatible:

    - enum:

    enum:

      - solomon,ssd1322

      - solomon,ssd1325

      - solomon,ssd1327

drivers/gpu/drm/solomon/ssd130x.c

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static int ssd132x_primary_plane_atomic_check(struct drm_plane *plane, 
	struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);

	struct ssd130x_plane_state *ssd130x_state = to_ssd130x_plane_state(plane_state);

	struct drm_crtc *crtc = plane_state->crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_crtc_state *crtc_state = NULL;

	const struct drm_format_info *fi;

	unsigned int pitch;

	int ret;