Commit 3de5f98d authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave 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
parents a3112838 74ea0616

drivers/gpu/drm/sun4i/sun8i_csc.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct sun8i_mixer; 


/* VI channel CSC units offsets */

#define CCSC00_OFFSET 0xAA050

#define CCSC01_OFFSET 0xFA000

#define CCSC01_OFFSET 0xFA050

#define CCSC10_OFFSET 0xA0000

#define CCSC11_OFFSET 0xF0000

drivers/gpu/drm/sun4i/sun8i_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static struct regmap_config sun8i_mixer_regmap_config = { 
	.reg_bits	= 32,

	.val_bits	= 32,

	.reg_stride	= 4,

	.max_register	= 0xbfffc, /* guessed */

	.max_register	= 0xffffc, /* guessed */

};



static int sun8i_mixer_of_get_id(struct device_node *node)

drivers/gpu/drm/vc4/vc4_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) 
	card->num_links = 1;

	card->name = "vc4-hdmi";

	card->dev = dev;

	card->owner = THIS_MODULE;



	/*

	 * Be careful, snd_soc_register_card() calls dev_set_drvdata() and