Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'drm-misc-fixes-2020-09-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

drm-misc-fixes for v5.9-rc6:
- Fill asoc card owner in vc4.
- Program secondary CSC correctly in sun4i, and extend
register mapping to cover secondary CSC registers.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e3ab56cf-3b8e-9b21-f1b6-9a4989a52996@linux.intel.com

+3 -2
+1 -1
drivers/gpu/drm/sun4i/sun8i_csc.h
··· 12 12 13 13 /* VI channel CSC units offsets */ 14 14 #define CCSC00_OFFSET 0xAA050 15 - #define CCSC01_OFFSET 0xFA000 15 + #define CCSC01_OFFSET 0xFA050 16 16 #define CCSC10_OFFSET 0xA0000 17 17 #define CCSC11_OFFSET 0xF0000 18 18
+1 -1
drivers/gpu/drm/sun4i/sun8i_mixer.c
··· 307 307 .reg_bits = 32, 308 308 .val_bits = 32, 309 309 .reg_stride = 4, 310 - .max_register = 0xbfffc, /* guessed */ 310 + .max_register = 0xffffc, /* guessed */ 311 311 }; 312 312 313 313 static int sun8i_mixer_of_get_id(struct device_node *node)
+1
drivers/gpu/drm/vc4/vc4_hdmi.c
··· 1117 1117 card->num_links = 1; 1118 1118 card->name = "vc4-hdmi"; 1119 1119 card->dev = dev; 1120 + card->owner = THIS_MODULE; 1120 1121 1121 1122 /* 1122 1123 * Be careful, snd_soc_register_card() calls dev_set_drvdata() and