1*4882a593SmuzhiyunFrom 468e457e57a46d2e5dd7d7831826992ab31f68d2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Thu, 9 Jun 2022 16:15:07 +0800 4*4882a593SmuzhiyunSubject: [PATCH 1/9] HACK: Fix compile errors 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 7*4882a593Smuzhiyun--- 8*4882a593Smuzhiyun common.mk | 1 - 9*4882a593Smuzhiyun drm.c | 2 +- 10*4882a593Smuzhiyun fb.c | 13 +++++++++---- 11*4882a593Smuzhiyun 3 files changed, 10 insertions(+), 6 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/common.mk b/common.mk 14*4882a593Smuzhiyunindex c699152..055e75e 100644 15*4882a593Smuzhiyun--- a/common.mk 16*4882a593Smuzhiyun+++ b/common.mk 17*4882a593Smuzhiyun@@ -314,7 +314,6 @@ COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb 18*4882a593Smuzhiyun COMMON_CFLAGS := -Wall -Werror -fno-strict-aliasing $(SSP_CFLAGS) -O1 -Wformat=2 19*4882a593Smuzhiyun CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) 20*4882a593Smuzhiyun CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) 21*4882a593Smuzhiyun-CPPFLAGS += -D_FORTIFY_SOURCE=2 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun # Enable large file support. 24*4882a593Smuzhiyun CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 25*4882a593Smuzhiyundiff --git a/drm.c b/drm.c 26*4882a593Smuzhiyunindex 34d4b78..037a820 100644 27*4882a593Smuzhiyun--- a/drm.c 28*4882a593Smuzhiyun+++ b/drm.c 29*4882a593Smuzhiyun@@ -821,7 +821,7 @@ static int remove_gamma_properties(drm_t* drm, uint32_t crtc_id) { 30*4882a593Smuzhiyun int32_t drm_setmode(drm_t* drm, uint32_t fb_id) 31*4882a593Smuzhiyun { 32*4882a593Smuzhiyun int conn; 33*4882a593Smuzhiyun- int32_t ret; 34*4882a593Smuzhiyun+ int32_t ret = 0; 35*4882a593Smuzhiyun uint32_t existing_console_crtc_id = 0; 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun if (drm->atomic) 38*4882a593Smuzhiyundiff --git a/fb.c b/fb.c 39*4882a593Smuzhiyunindex 77219c2..9bb2599 100644 40*4882a593Smuzhiyun--- a/fb.c 41*4882a593Smuzhiyun+++ b/fb.c 42*4882a593Smuzhiyun@@ -51,10 +51,15 @@ static int fb_buffer_create(fb_t* fb, 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun fb->lock.map_offset = map_dumb.offset; 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun- uint32_t offset = 0; 47*4882a593Smuzhiyun+ uint32_t handles[4] = {0}; 48*4882a593Smuzhiyun+ uint32_t pitches[4] = {0}; 49*4882a593Smuzhiyun+ uint32_t offsets[4] = {0}; 50*4882a593Smuzhiyun+ handles[0] = create_dumb.handle; 51*4882a593Smuzhiyun+ pitches[0] = create_dumb.pitch; 52*4882a593Smuzhiyun+ 53*4882a593Smuzhiyun ret = drmModeAddFB2(fb->drm->fd, fb->drm->console_mode_info.hdisplay, fb->drm->console_mode_info.vdisplay, 54*4882a593Smuzhiyun- DRM_FORMAT_XRGB8888, &create_dumb.handle, 55*4882a593Smuzhiyun- &create_dumb.pitch, &offset, &fb->fb_id, 0); 56*4882a593Smuzhiyun+ DRM_FORMAT_XRGB8888, handles, 57*4882a593Smuzhiyun+ pitches, offsets, &fb->fb_id, 0); 58*4882a593Smuzhiyun if (ret) { 59*4882a593Smuzhiyun LOG(ERROR, "drmModeAddFB2 failed"); 60*4882a593Smuzhiyun goto destroy_buffer; 61*4882a593Smuzhiyun@@ -161,7 +166,7 @@ static bool parse_edid_dtd_display_size(drm_t* drm, int32_t* hsize_mm, int32_t* 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun int fb_buffer_init(fb_t* fb) 64*4882a593Smuzhiyun { 65*4882a593Smuzhiyun- int32_t width, height, pitch; 66*4882a593Smuzhiyun+ int32_t width, height, pitch = 0; 67*4882a593Smuzhiyun int32_t hsize_mm, vsize_mm; 68*4882a593Smuzhiyun int r; 69*4882a593Smuzhiyun 70*4882a593Smuzhiyun-- 71*4882a593Smuzhiyun2.20.1 72*4882a593Smuzhiyun 73